pixman: Branch 'master'

[Søren Sandmann Pedersen]

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

New commits:
commit c89f4c826695dbb5df0817d84f845dbd3e28b7a7
Author: Søren Sandmann Pedersen <ssp at redhat.com>
Date:   Wed Oct 2 17:51:36 2013 -0400

    fast: Swap image and iter flags in generated fast paths
    
    The generated fast paths that were moved into the 'fast'
    implementation in ec0e38cbb746a673f8e989ab8eae356c8c77dac7 had their
    image and iter flag arguments swapped; as a result, none of the fast
    paths were ever called.

diff --git a/pixman/pixman-fast-path.c b/pixman/pixman-fast-path.c
index b06d1b2..c6e43de 100644
--- a/pixman/pixman-fast-path.c
+++ b/pixman/pixman-fast-path.c
@@ -3236,22 +3236,22 @@ static const pixman_iter_info_t fast_iters[] =
     
 #define SEPARABLE_CONVOLUTION_AFFINE_FAST_PATH(name, format, repeat)   \
     { PIXMAN_ ## format,						\
-      ITER_NARROW | ITER_SRC,						\
       GENERAL_SEPARABLE_CONVOLUTION_FLAGS | FAST_PATH_ ## repeat ## _REPEAT, \
+      ITER_NARROW | ITER_SRC,						\
       NULL, bits_image_fetch_separable_convolution_affine_ ## name, NULL \
     },
 
 #define BILINEAR_AFFINE_FAST_PATH(name, format, repeat)			\
     { PIXMAN_ ## format,						\
-      ITER_NARROW | ITER_SRC,						\
       GENERAL_BILINEAR_FLAGS | FAST_PATH_ ## repeat ## _REPEAT,		\
+      ITER_NARROW | ITER_SRC,						\
       NULL, bits_image_fetch_bilinear_affine_ ## name, NULL,		\
     },
 
 #define NEAREST_AFFINE_FAST_PATH(name, format, repeat)			\
     { PIXMAN_ ## format,						\
-      ITER_NARROW | ITER_SRC,						\
       GENERAL_NEAREST_FLAGS | FAST_PATH_ ## repeat ## _REPEAT,		\
+      ITER_NARROW | ITER_SRC,						\
       NULL, bits_image_fetch_nearest_affine_ ## name, NULL		\
     },