pixman: Branch 'master'

[Søren Sandmann Pedersen]

 pixman/pixman-pict.c |    5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

New commits:
commit 3d0911dee7f1d00b1e61fb183ab337c693b49adc
Author: Søren Sandmann Pedersen <sandmann at redhat.com>
Date:   Fri Feb 6 18:03:31 2009 -0500

    Reinstate SrcScaledNearest optimization

diff --git a/pixman/pixman-pict.c b/pixman/pixman-pict.c
index 6c43208..caae1da 100644
--- a/pixman/pixman-pict.c
+++ b/pixman/pixman-pict.c
@@ -1941,7 +1941,6 @@ pixman_image_composite (pixman_op_t      op,
     if(op == PIXMAN_OP_DST)
         return;
 
-#if 0
     if (pSrc->type == BITS
         && srcTransform
         && !pMask
@@ -1962,9 +1961,7 @@ pixman_image_composite (pixman_op_t      op,
             pSrc->common.transform->matrix[2][2] == pixman_fixed_1) {
             func = fbCompositeSrcScaleNearest;
         }
-    } else
-#endif
-    if ((pSrc->type == BITS || pixman_image_can_get_solid (pSrc)) && (!pMask || pMask->type == BITS)
+    } else if ((pSrc->type == BITS || pixman_image_can_get_solid (pSrc)) && (!pMask || pMask->type == BITS)
         && !srcTransform && !maskTransform
         && !maskAlphaMap && !srcAlphaMap && !dstAlphaMap
         && (pSrc->common.filter != PIXMAN_FILTER_CONVOLUTION)