diff options
author | Søren Sandmann Pedersen <sandmann@redhat.com> | 2009-06-04 05:59:25 -0400 |
---|---|---|
committer | Søren Sandmann Pedersen <sandmann@redhat.com> | 2009-06-19 13:21:29 -0400 |
commit | 70982e6a78f20ecf057d6883c6296519fd026fea (patch) | |
tree | 2a6ffbf7b67f6a3c6ec01f300ddb270c2db4f1c5 | |
parent | c56f89c0928dc03e9ec1d9d7088deec9b252dfd2 (diff) |
Remove noop access macros
-rw-r--r-- | pixman/pixman-bits-image.c | 19 | ||||
-rw-r--r-- | pixman/pixman-image.c | 2 |
2 files changed, 6 insertions, 15 deletions
diff --git a/pixman/pixman-bits-image.c b/pixman/pixman-bits-image.c index 51083fa3..54923783 100644 --- a/pixman/pixman-bits-image.c +++ b/pixman/pixman-bits-image.c @@ -35,9 +35,6 @@ #define Green(x) (((x) >> 8) & 0xff) #define Blue(x) ((x) & 0xff) -#define READ_ACCESS(f) (f) -#define WRITE_ACCESS(f) (f) - /* Store functions */ static void @@ -766,21 +763,17 @@ bits_image_property_changed (pixman_image_t *image) (scanFetchProc)bits_image_fetch_transformed; } - bits->fetch_scanline_raw_32 = - READ_ACCESS(pixman_fetchProcForPicture32)(bits); - bits->fetch_scanline_raw_64 = - READ_ACCESS(pixman_fetchProcForPicture64)(bits); + bits->fetch_scanline_raw_32 = pixman_fetchProcForPicture32 (bits); + bits->fetch_scanline_raw_64 = pixman_fetchProcForPicture64 (bits); - bits->fetch_pixels_raw_32 = READ_ACCESS(pixman_fetchPixelProcForPicture32)(bits); - bits->fetch_pixels_raw_64 = READ_ACCESS(pixman_fetchPixelProcForPicture64)(bits); + bits->fetch_pixels_raw_32 = pixman_fetchPixelProcForPicture32 (bits); + bits->fetch_pixels_raw_64 = pixman_fetchPixelProcForPicture64 (bits); bits->store_scanline_64 = bits_image_store_scanline_64; bits->store_scanline_32 = bits_image_store_scanline_32; - bits->store_scanline_raw_32 = - WRITE_ACCESS(pixman_storeProcForPicture32)(bits); - bits->store_scanline_raw_64 = - WRITE_ACCESS(pixman_storeProcForPicture64)(bits); + bits->store_scanline_raw_32 = pixman_storeProcForPicture32 (bits); + bits->store_scanline_raw_64 = pixman_storeProcForPicture64 (bits); } static uint32_t * diff --git a/pixman/pixman-image.c b/pixman/pixman-image.c index 0612f0f8..0c504255 100644 --- a/pixman/pixman-image.c +++ b/pixman/pixman-image.c @@ -163,8 +163,6 @@ _pixman_image_get_fetcher (pixman_image_t *image, return image->common.get_scanline_32; } -#define WRITE_ACCESS(f) ((image->common.write_func)? f##_accessors : f) - static void image_property_changed (pixman_image_t *image) { |