Fix special case selection when the mask has a transform

http://gitweb.freedesktop.org/?p=xorg/xserver.git;a=commitdiff;h=c19ece1d8c32dc81740a4036a642661f54064e75
was a mismerge that avoided setting the maskTransform condition when the mask
has a transform.  This allowed a special case routine to be chosen when the
mask had a transform, which is not expected by the special case routines.

diff --git a/pixman/pixman-pict.c b/pixman/pixman-pict.c
index 3bc5267..d6564ff 100644 (file)
--- a/pixman/pixman-pict.c
+++ b/pixman/pixman-pict.c
@@ -1429,6 +1429,7 @@ pixman_image_composite (pixman_op_t      op,
     {
        maskRepeat = pMask->common.repeat == PIXMAN_REPEAT_NORMAL;
 
+       maskTransform = pMask->common.transform != 0;
        if (pMask->common.filter == PIXMAN_FILTER_CONVOLUTION)
            maskTransform = TRUE;