summaryrefslogtreecommitdiff
path: root/pixman
diff options
context:
space:
mode:
authorSøren Sandmann <ssp@redhat.com>2013-11-23 20:30:33 -0500
committerSøren Sandmann <ssp@redhat.com>2013-11-23 20:30:33 -0500
commit9ba3a34797399b286dbfe21c7b213a7547abf577 (patch)
treeab3b6dd65cc119e1124ae76f13ca8cad3bd1c041 /pixman
parentf473fd1e7553a4e92a0d72bea360f05d005c9a88 (diff)
general: Support component alpha for all image types
Currently, if you attempt to use component alpha on source images or images without RGB channels, Pixman will silently just use unified alpha instead. This patch makes such images supported for component alpha. There is no particularly compelling usecase at the moment, but this patch does get rid of a bit of special-case code both in pixman-general.c and in test/composite.c.
Diffstat (limited to 'pixman')
-rw-r--r--pixman/pixman-general.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/pixman/pixman-general.c b/pixman/pixman-general.c
index a653fa7..8bce7c0 100644
--- a/pixman/pixman-general.c
+++ b/pixman/pixman-general.c
@@ -183,11 +183,7 @@ general_composite_rect (pixman_implementation_t *imp,
mask_image = NULL;
}
- component_alpha =
- mask_image &&
- mask_image->common.type == BITS &&
- mask_image->common.component_alpha &&
- PIXMAN_FORMAT_RGB (mask_image->bits.format);
+ component_alpha = mask_image && mask_image->common.component_alpha;
_pixman_implementation_iter_init (
imp->toplevel, &mask_iter,