pixman: Branch 'master'

[Søren Sandmann Pedersen]

 pixman/pixman-utils.c |   19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

New commits:
commit 9e1a34a0d177e8c2381f419b0a04310da8cdde2b
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Fri Aug 28 06:31:06 2009 -0400

    _pixman_run_fast_path: typo
    
    This is one example of a compiler warning that was lost amit the build
    noise.
    
    The error here is that in a list of required conditions we used ';'
    instead of '&&' with the result of continuing to use the fast-path
    even if we had a wide mask.
    
    Another error is that it was testing src, not mask as it should.

diff --git a/pixman/pixman-utils.c b/pixman/pixman-utils.c
index 961c6c6..7128206 100644
--- a/pixman/pixman-utils.c
+++ b/pixman/pixman-utils.c
@@ -670,15 +670,16 @@ _pixman_run_fast_path (const pixman_fast_path_t *paths,
 
     if (mask && has_fast_path)
     {
-	has_fast_path = mask->type == BITS &&
-	                !mask->common.transform &&
-	                !mask->common.alpha_map &&
-	                !mask->bits.read_func &&
-	                !mask->bits.write_func &&
-			 mask->common.filter != PIXMAN_FILTER_CONVOLUTION &&
-			 mask->common.repeat != PIXMAN_REPEAT_PAD &&
-			 mask->common.repeat != PIXMAN_REPEAT_REFLECT;
-	                !PIXMAN_FORMAT_IS_WIDE (src->bits.format);
+	has_fast_path =
+	    mask->type == BITS &&
+	    !mask->common.transform &&
+	    !mask->common.alpha_map &&
+	    !mask->bits.read_func &&
+	    !mask->bits.write_func &&
+	    mask->common.filter != PIXMAN_FILTER_CONVOLUTION &&
+	    mask->common.repeat != PIXMAN_REPEAT_PAD &&
+	    mask->common.repeat != PIXMAN_REPEAT_REFLECT &&
+	    !PIXMAN_FORMAT_IS_WIDE (mask->bits.format);
     }
 
     if (has_fast_path)