pixman: Branch 'master'

[Søren Sandmann Pedersen]

 pixman/pixman-fast-path.c |    8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

New commits:
commit 273e89750b3ce901fa6769a835fa441ee986d508
Author: Søren Sandmann Pedersen <sandmann at redhat.com>
Date:   Mon Sep 14 18:48:32 2009 -0400

    Remove optimization for 0xffffffff and 0xff the add_n_8888_8888_ca fast path
    
    This is an ADD operation, not an OVER. Fixes bug 23934, reported by
    Siarhei Siamashka.

diff --git a/pixman/pixman-fast-path.c b/pixman/pixman-fast-path.c
index c3f30df..25f6016 100644
--- a/pixman/pixman-fast-path.c
+++ b/pixman/pixman-fast-path.c
@@ -389,15 +389,11 @@ fast_composite_add_n_8888_8888_ca (pixman_implementation_t *imp,
 	{
 	    ma = *mask++;
 
-	    if (ma == 0xffffffff && srca == 0xff)
-	    {
-		*dst = src;
-	    }
-	    else if (ma)
+	    if (ma)
 	    {
 		d = *dst;
 		s = src;
-		
+
 		UN8x4_MUL_UN8x4_ADD_UN8x4 (s, ma, d);
 
 		*dst = s;