pixman: Branch 'master'

[Søren Sandmann Pedersen]

 pixman/pixman-pict.c |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 72b46bcf345db668b3ec00e7f27c5454cf2ad8b5
Author: Søren Sandmann <sandmann at redhat.com>
Date:   Fri Dec 7 18:59:54 2007 -0500

    Guard MMX get_fast_path() with pixman_have_mmx()

diff --git a/pixman/pixman-pict.c b/pixman/pixman-pict.c
index 1cb4a9e..26b4fce 100644
--- a/pixman/pixman-pict.c
+++ b/pixman/pixman-pict.c
@@ -1718,7 +1718,9 @@ pixman_image_composite (pixman_op_t      op,
 	    !maskRepeat;
 
 #ifdef USE_MMX
-	info = get_fast_path (mmx_fast_paths, op, pSrc, pMask, pDst, pixbuf);
+	info = NULL;
+	if (pixman_have_mmx())
+	    info = get_fast_path (mmx_fast_paths, op, pSrc, pMask, pDst, pixbuf);
 	if (!info)
 #endif
 	    info = get_fast_path (c_fast_paths, op, pSrc, pMask, pDst, pixbuf);