From eb16d171882d200a390345ec8a3db1b931e9676a Mon Sep 17 00:00:00 2001 From: =?utf8?q?S=C3=B8ren=20Sandmann=20Pedersen?= Date: Tue, 15 Sep 2009 07:43:23 -0400 Subject: [PATCH] Revert "Enable component alpha on solid masks." For consistency we will probably want to allow component alpha to be set on all masks at some point, but this commit only enabled it for solid images. This reverts commit 29e22cf38e8abc54b9dddbdeb3909d02866a82a0. --- pixman/pixman-general.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pixman/pixman-general.c b/pixman/pixman-general.c index 5c40103..3ead3da 100644 --- a/pixman/pixman-general.c +++ b/pixman/pixman-general.c @@ -159,9 +159,9 @@ general_composite_rect (pixman_implementation_t *imp, fetch_src && fetch_mask && mask && - mask->common.component_alpha && - (mask->common.type == SOLID || - (mask->common.type == BITS && PIXMAN_FORMAT_RGB (mask->bits.format))); + mask->common.type == BITS && + mask->common.component_alpha && + PIXMAN_FORMAT_RGB (mask->bits.format); if (wide) { -- 2.7.4