diff options
| author | Søren Sandmann Pedersen <sandmann@redhat.com> | 2010-02-26 14:15:22 -0500 |
|---|---|---|
| committer | Søren Sandmann Pedersen <sandmann@redhat.com> | 2010-03-04 04:15:44 -0500 |
| commit | bd9934551f72f4993016cab1d7be3b1e545629b1 (patch) | |
| tree | 43808076b065bb080626198546db48c352cc1064 | |
| parent | 14bb054d9695abb284e22a1de31337e0e41bb4e3 (diff) | |
Move __force_align_arg_pointer workaround before composite32()
Since otherwise the workaround won't take effect when you call
pixman_image_composite32() directly.
| -rw-r--r-- | pixman/pixman.c | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/pixman/pixman.c b/pixman/pixman.c index c0a985e..3aa265f 100644 --- a/pixman/pixman.c +++ b/pixman/pixman.c @@ -598,6 +598,24 @@ done: pixman_region32_fini (®ion); } +PIXMAN_EXPORT void +pixman_image_composite (pixman_op_t op, + pixman_image_t * src, + pixman_image_t * mask, + pixman_image_t * dest, + int16_t src_x, + int16_t src_y, + int16_t mask_x, + int16_t mask_y, + int16_t dest_x, + int16_t dest_y, + uint16_t width, + uint16_t height) +{ + pixman_image_composite32 (op, src, mask, dest, src_x, src_y, + mask_x, mask_y, dest_x, dest_y, width, height); +} + /* * Work around GCC bug causing crashes in Mozilla with SSE2 * @@ -618,24 +636,6 @@ done: __attribute__((__force_align_arg_pointer__)) #endif PIXMAN_EXPORT void -pixman_image_composite (pixman_op_t op, - pixman_image_t * src, - pixman_image_t * mask, - pixman_image_t * dest, - int16_t src_x, - int16_t src_y, - int16_t mask_x, - int16_t mask_y, - int16_t dest_x, - int16_t dest_y, - uint16_t width, - uint16_t height) -{ - pixman_image_composite32 (op, src, mask, dest, src_x, src_y, - mask_x, mask_y, dest_x, dest_y, width, height); -} - -PIXMAN_EXPORT void pixman_image_composite32 (pixman_op_t op, pixman_image_t * src, pixman_image_t * mask, |