pixman: Branch 'master'

[Søren Sandmann Pedersen]

 pixman/pixman-mmx.c |   11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

New commits:
commit 1c429b4fbedc5287659c836c0d30801a6209bf57
Author: Søren Sandmann Pedersen <sandmann at redhat.com>
Date:   Mon Jun 22 19:25:25 2009 -0400

    Make pixman-mmx.c compile again.

diff --git a/pixman/pixman-mmx.c b/pixman/pixman-mmx.c
index fa1b6f1..00480f6 100644
--- a/pixman/pixman-mmx.c
+++ b/pixman/pixman-mmx.c
@@ -2497,14 +2497,15 @@ fbCompositeIn_nx8x8mmx (pixman_implementation_t *imp,
 	{
 	    uint16_t	tmp;
 	    uint8_t	a;
-	    uint32_t	m;
+	    uint32_t	m, d;
 
 	    a = *mask++;
-
-	    m = FbIntMult (m, a, tmp);
-	    *dst = FbIntMult (m, *dst, tmp);
+	    d = *dst;
 	    
-	    *dst++ = r;
+	    m = FbIntMult (sa, a, tmp);
+	    d = FbIntMult (m, d, tmp);
+	    
+	    *dst++ = d;
 	}
     }