diff options
| author | Carl Worth <cworth@cworth.org> | 2005-11-21 11:46:40 +0000 |
|---|---|---|
| committer | Carl Worth <cworth@cworth.org> | 2005-11-21 11:46:40 +0000 |
| commit | 9e7076fd27b69b4de21a617a9cb0fa74f91f6bec (patch) | |
| tree | 7194c74b2a466459b1ae50b691f09b08a1b286da | |
| parent | 674ed1932e2264493e5f746989f02a6f2e0259a9 (diff) | |
Remove duplicate definitions of pixman_color_to_pixel and pixman_composite.
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | pixman/ChangeLog | 5 | ||||
| -rw-r--r-- | pixman/src/pixman-remap.h | 2 |
3 files changed, 10 insertions, 2 deletions
@@ -1,5 +1,10 @@ 2005-11-21 Carl Worth <cworth@cworth.org> + * src/pixman-remap.h: Remove duplicate definitions of + pixman_color_to_pixel and pixman_composite. + +2005-11-21 Carl Worth <cworth@cworth.org> + * ROADMAP: Add reminder to fix all memory leaks (as determined by the test suite) before release 1.2.0. diff --git a/pixman/ChangeLog b/pixman/ChangeLog index 0ccbf7ed8..50b57a898 100644 --- a/pixman/ChangeLog +++ b/pixman/ChangeLog @@ -1,3 +1,8 @@ +2005-11-21 Carl Worth <cworth@cworth.org> + + * src/pixman-remap.h: Remove duplicate definitions of + pixman_color_to_pixel and pixman_composite. + 2005-11-18 Carl Worth <cworth@cworth.org> * src/pixman-remap.h: Remove spurios INT_ prefixes which break the diff --git a/pixman/src/pixman-remap.h b/pixman/src/pixman-remap.h index 87d9e27c6..103de496e 100644 --- a/pixman/src/pixman-remap.h +++ b/pixman/src/pixman-remap.h @@ -1,10 +1,8 @@ #define pixman_add_trapezoids _cairo_pixman_add_trapezoids #define pixman_color_to_pixel _cairo_pixman_color_to_pixel -#define pixman_color_to_pixel _cairo_pixman_color_to_pixel #define composeFunctions _cairo_pixman_compose_functions #define fbComposeSetupMMX _cairo_pixman_compose_setup_mmx #define pixman_composite _cairo_pixman_composite -#define pixman_composite _cairo_pixman_composite #define fbCompositeCopyAreammx _cairo_pixman_composite_copy_area_mmx #define fbCompositeSolidMask_nx8888x0565Cmmx _cairo_pixman_composite_solid_mask_nx8888x0565Cmmx #define fbCompositeSolidMask_nx8888x8888Cmmx _cairo_pixman_composite_solid_mask_nx8888x8888Cmmx |