summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSøren Sandmann Pedersen <ssp@redhat.com>2012-03-28 15:36:08 -0400
committerSøren Sandmann Pedersen <ssp@redhat.com>2012-09-29 09:58:19 -0400
commit92d0c246f8483e112d240d4face484dfd8f05a72 (patch)
tree0eaeff0995d428f064953950cf721cf3131d7886
parent879d6ee39eee5781e8bfee1034590cdc940868ac (diff)
Remove pointless optimization that pixman already does itself
-rw-r--r--src/cairo-image-compositor.c25
1 files changed, 8 insertions, 17 deletions
diff --git a/src/cairo-image-compositor.c b/src/cairo-image-compositor.c
index 768e3a50..9eeee976 100644
--- a/src/cairo-image-compositor.c
+++ b/src/cairo-image-compositor.c
@@ -102,25 +102,16 @@ draw_image_boxes (void *_dst,
int y = _cairo_fixed_integer_part (b->p1.y);
int w = _cairo_fixed_integer_part (b->p2.x) - x;
int h = _cairo_fixed_integer_part (b->p2.y) - y;
- if (dst->pixman_format != image->pixman_format ||
- ! pixman_blt ((uint32_t *)image->data, (uint32_t *)dst->data,
- image->stride / sizeof (uint32_t),
- dst->stride / sizeof (uint32_t),
- PIXMAN_FORMAT_BPP (image->pixman_format),
- PIXMAN_FORMAT_BPP (dst->pixman_format),
- x + dx, y + dy,
- x, y,
- w, h))
- {
- pixman_image_composite32 (PIXMAN_OP_SRC,
- image->pixman_image, NULL, dst->pixman_image,
- x + dx, y + dy,
- 0, 0,
- x, y,
- w, h);
- }
+
+ pixman_image_composite32 (PIXMAN_OP_SRC,
+ image->pixman_image, NULL, dst->pixman_image,
+ x + dx, y + dy,
+ 0, 0,
+ x, y,
+ w, h);
}
}
+
return CAIRO_STATUS_SUCCESS;
}