pixman: Branch 'master'

[Søren Sandmann Pedersen]

 pixman/pixman-sse2.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 96340123eba05bff85433bb2db3a7ad80c8e57ba
Author: Søren Sandmann Pedersen <sandmann at redhat.com>
Date:   Tue Jul 21 01:24:43 2009 -0400

    Fix typo in sse2_combine_over_pixbuf_0565()

diff --git a/pixman/pixman-sse2.c b/pixman/pixman-sse2.c
index 7e938df..3ed8165 100644
--- a/pixman/pixman-sse2.c
+++ b/pixman/pixman-sse2.c
@@ -4353,7 +4353,7 @@ sse2_composite_over_pixbuf_0565 (pixman_implementation_t *imp,
 		invert_colors_2x128 (xmm_src_lo, xmm_src_hi,
 				     &xmm_dst2, &xmm_dst3);
 	    }
-	    else if (zero)
+	    else if (!zero)
 	    {
 		over_rev_non_pre_2x128 (xmm_src_lo, xmm_src_hi,
 					&xmm_dst2, &xmm_dst3);