pixman: Branch 'master'

[Søren Sandmann Pedersen]

 pixman/pixman-noop.c |   10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

New commits:
commit 2320f0520b71c5d30b30125971df6a4245ce5207
Author: Søren Sandmann Pedersen <ssp at redhat.com>
Date:   Sat May 18 11:39:34 2013 -0400

    Make use of image flag in noop iterators
    
    Similar to c2230fe2aff, simply check against SAMPLES_COVER_CLIP_NEAREST
    instead of comparing all the x/y/width/height parameters.

diff --git a/pixman/pixman-noop.c b/pixman/pixman-noop.c
index e39996d..955e9c8 100644
--- a/pixman/pixman-noop.c
+++ b/pixman/pixman-noop.c
@@ -64,8 +64,9 @@ noop_src_iter_init (pixman_implementation_t *imp, pixman_iter_t *iter)
 {
     pixman_image_t *image = iter->image;
 
-#define FLAGS						\
-    (FAST_PATH_STANDARD_FLAGS | FAST_PATH_ID_TRANSFORM)
+#define FLAGS								\
+    (FAST_PATH_STANDARD_FLAGS | FAST_PATH_ID_TRANSFORM |		\
+     FAST_PATH_BITS_IMAGE | FAST_PATH_SAMPLES_COVER_CLIP_NEAREST)
 
     if (!image)
     {
@@ -113,10 +114,7 @@ noop_src_iter_init (pixman_implementation_t *imp, pixman_iter_t *iter)
     }
     else if (image->common.extended_format_code == PIXMAN_a8r8g8b8	&&
 	     (iter->iter_flags & ITER_NARROW)				&&
-	     (iter->image_flags & FLAGS) == FLAGS			&&
-	     iter->x >= 0 && iter->y >= 0				&&
-	     iter->x + iter->width <= image->bits.width			&&
-	     iter->y + iter->height <= image->bits.height)
+	     (iter->image_flags & FLAGS) == FLAGS)
     {
 	iter->buffer =
 	    image->bits.bits + iter->y * image->bits.rowstride + iter->x;