diff options
| author | Søren Sandmann Pedersen <ssp@redhat.com> | 2010-12-10 12:31:29 -0500 |
|---|---|---|
| committer | Søren Sandmann Pedersen <ssp@redhat.com> | 2011-01-18 12:42:25 -0500 |
| commit | 23c6e1d2c007cc661b31e1bcdfd84604d7a9a560 (patch) | |
| tree | 151c8da8704e748201e60a71e4108f1c73f91e0b /pixman/pixman-bits-image.c | |
| parent | b2c9eaa5020d08cfaac6c2296895e5a65c971ffd (diff) | |
Eliminate the _pixman_image_store_scanline_32/64 functions
They were only called from next_line_write_narrow/wide, so they could
simply be absorbed into those functions.
Diffstat (limited to 'pixman/pixman-bits-image.c')
| -rw-r--r-- | pixman/pixman-bits-image.c | 79 |
1 files changed, 36 insertions, 43 deletions
diff --git a/pixman/pixman-bits-image.c b/pixman/pixman-bits-image.c index bcada58..bf22dbf 100644 --- a/pixman/pixman-bits-image.c +++ b/pixman/pixman-bits-image.c @@ -35,45 +35,6 @@ #include "pixman-private.h" #include "pixman-combine32.h" -/* Store functions */ -void -_pixman_image_store_scanline_32 (bits_image_t * image, - int x, - int y, - int width, - const uint32_t *buffer) -{ - image->store_scanline_32 (image, x, y, width, buffer); - - if (image->common.alpha_map) - { - x -= image->common.alpha_origin_x; - y -= image->common.alpha_origin_y; - - image->common.alpha_map->store_scanline_32 ( - image->common.alpha_map, x, y, width, buffer); - } -} - -void -_pixman_image_store_scanline_64 (bits_image_t * image, - int x, - int y, - int width, - const uint32_t *buffer) -{ - image->store_scanline_64 (image, x, y, width, buffer); - - if (image->common.alpha_map) - { - x -= image->common.alpha_origin_x; - y -= image->common.alpha_origin_y; - - image->common.alpha_map->store_scanline_64 ( - image->common.alpha_map, x, y, width, buffer); - } -} - /* Fetch functions */ static force_inline uint32_t @@ -1397,15 +1358,47 @@ dest_get_scanline_wide (pixman_iter_t *iter, const uint32_t *mask) static void dest_write_back_narrow (pixman_iter_t *iter) { - _pixman_image_store_scanline_32 ( - &iter->image->bits, iter->x, iter->y++, iter->width, iter->buffer); + bits_image_t * image = &iter->image->bits; + int x = iter->x; + int y = iter->y; + int width = iter->width; + const uint32_t *buffer = iter->buffer; + + image->store_scanline_32 (image, x, y, width, buffer); + + if (image->common.alpha_map) + { + x -= image->common.alpha_origin_x; + y -= image->common.alpha_origin_y; + + image->common.alpha_map->store_scanline_32 ( + image->common.alpha_map, x, y, width, buffer); + } + + iter->y++; } static void dest_write_back_wide (pixman_iter_t *iter) { - _pixman_image_store_scanline_64 ( - &iter->image->bits, iter->x, iter->y++, iter->width, iter->buffer); + bits_image_t * image = &iter->image->bits; + int x = iter->x; + int y = iter->y; + int width = iter->width; + const uint32_t *buffer = iter->buffer; + + image->store_scanline_64 (image, x, y, width, buffer); + + if (image->common.alpha_map) + { + x -= image->common.alpha_origin_x; + y -= image->common.alpha_origin_y; + + image->common.alpha_map->store_scanline_64 ( + image->common.alpha_map, x, y, width, buffer); + } + + iter->y++; } void |