summaryrefslogtreecommitdiff
authorSøren Sandmann Pedersen <ssp@redhat.com>2013-05-18 15:39:34 (GMT)
committer Søren Sandmann Pedersen <ssp@redhat.com>2013-05-22 08:28:41 (GMT)
commit2320f0520b71c5d30b30125971df6a4245ce5207 (patch) (side-by-side diff)
treec0c902641b675407e4addc022ff6b4244fb1ed22
parentd77d75cc6e5de14d027d22b70389a4d0c71048b9 (diff)
downloadpixman-master.zip
pixman-master.tar.gz
Make use of image flag in noop iteratorsHEADmaster
Similar to c2230fe2aff, simply check against SAMPLES_COVER_CLIP_NEAREST instead of comparing all the x/y/width/height parameters.
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--pixman/pixman-noop.c10
1 files changed, 4 insertions, 6 deletions
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;