Add src, mask, and dest flags to the composite args struct.

These flags are useful in the various compositing routines, and the
flags stored in the image structs are missing some bits of information
that can only be computed when pixman_image_composite() is called.

diff --git a/pixman/pixman-private.h b/pixman/pixman-private.h
index 741fa7eaaaa1f19c482d59ecf39752b1940751b1..c315220c325060cf70169807efcd456073e17510 100644 (file)
--- a/pixman/pixman-private.h
+++ b/pixman/pixman-private.h
@@ -373,6 +373,10 @@ typedef struct
     int32_t                  dest_y;
     int32_t                  width;
     int32_t                  height;
+
+    uint32_t                 src_flags;
+    uint32_t                 mask_flags;
+    uint32_t                 dest_flags;
 } pixman_composite_info_t;
 
 #define PIXMAN_COMPOSITE_ARGS(info)                                    \

diff --git a/pixman/pixman.c b/pixman/pixman.c
index 87f5a933a9695d6e9a5a34cd40c27629f93e9861..8ff78e99640180630d12d883b9125c547d485267 100644 (file)
--- a/pixman/pixman.c
+++ b/pixman/pixman.c
@@ -804,6 +804,9 @@ pixman_image_composite32 (pixman_op_t      op,
        info.src_image = src;
        info.mask_image = mask;
        info.dest_image = dest;
+       info.src_flags = src_flags;
+       info.mask_flags = mask_flags;
+       info.dest_flags = dest_flags;
 
        pbox = pixman_region32_rectangles (&region, &n);