diff options
| author | Benjamin Otte <otte@redhat.com> | 2010-01-26 18:52:27 +0100 |
|---|---|---|
| committer | Benjamin Otte <otte@redhat.com> | 2010-01-26 20:22:52 +0100 |
| commit | e841c556d59ca0aa6d86eaf6dbf061ae0f4287de (patch) | |
| tree | 28ba88830c41dc2d542cd0c5e132f92d88b0fd19 | |
| parent | 78b6c470789eb226708a5d98bb06a962d2ae0b0d (diff) | |
Add pixman_image_composite32()
This is equal to pixman_image_composite(), just with 32bit parameters.
pixman_image_composite() now just calls pixman_image_composite32()
| -rw-r--r-- | pixman/pixman.c | 22 | ||||
| -rw-r--r-- | pixman/pixman.h | 12 |
2 files changed, 32 insertions, 2 deletions
diff --git a/pixman/pixman.c b/pixman/pixman.c index 0edd967..6b28093 100644 --- a/pixman/pixman.c +++ b/pixman/pixman.c @@ -109,8 +109,8 @@ pixman_optimize_operator (pixman_op_t op, static void apply_workaround (pixman_image_t *image, - int16_t * x, - int16_t * y, + int32_t * x, + int32_t * y, uint32_t ** save_bits, int * save_dx, int * save_dy) @@ -166,6 +166,24 @@ pixman_image_composite (pixman_op_t op, 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, + pixman_image_t * dest, + int32_t src_x, + int32_t src_y, + int32_t mask_x, + int32_t mask_y, + int32_t dest_x, + int32_t dest_y, + int32_t width, + int32_t height) +{ uint32_t *src_bits; int src_dx, src_dy; uint32_t *mask_bits; diff --git a/pixman/pixman.h b/pixman/pixman.h index 546f0df..ff78b95 100644 --- a/pixman/pixman.h +++ b/pixman/pixman.h @@ -787,6 +787,18 @@ void pixman_image_composite (pixman_op_t op, int16_t dest_y, uint16_t width, uint16_t height); +void pixman_image_composite32 (pixman_op_t op, + pixman_image_t *src, + pixman_image_t *mask, + pixman_image_t *dest, + int32_t src_x, + int32_t src_y, + int32_t mask_x, + int32_t mask_y, + int32_t dest_x, + int32_t dest_y, + int32_t width, + int32_t height); /* Old X servers rely on out-of-bounds accesses when they are asked * to composite with a window as the source. They create a pixman image |