summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Wilson <chris@chris-wilson.co.uk>2009-09-02 00:41:18 +0100
committerChris Wilson <chris@chris-wilson.co.uk>2009-09-02 00:41:18 +0100
commit17cdffafda04514f08e0f0f11d0a85b938282c38 (patch)
treeb6c75f383fd5ecac4e0946c8a81c22522fb7d2a9
parent59c4fe93ee30c8182ae1a29267b9c08602e2f6c5 (diff)
[xlib] Remove stray code
Grr. Should have spotted this before pushing - remove the addition of the superfluous code.
-rw-r--r--src/cairo-xlib-surface.c13
1 files changed, 2 insertions, 11 deletions
diff --git a/src/cairo-xlib-surface.c b/src/cairo-xlib-surface.c
index 1de6a974..9d49d87b 100644
--- a/src/cairo-xlib-surface.c
+++ b/src/cairo-xlib-surface.c
@@ -2193,10 +2193,7 @@ _cairo_xlib_surface_composite (cairo_operator_t op,
assert (is_integer_translation);
if (clip_region == NULL) {
- XCopyArea (dst->dpy,
- src->drawable,
- dst->drawable,
- gc,
+ XCopyArea (dst->dpy, src->drawable, dst->drawable, gc,
src_x + src_attr.x_offset + itx,
src_y + src_attr.y_offset + ity,
width, height,
@@ -2212,10 +2209,7 @@ _cairo_xlib_surface_composite (cairo_operator_t op,
cairo_rectangle_int_t rect;
cairo_region_get_rectangle (clip_region, n, &rect);
- XCopyArea (dst->dpy,
- src->drawable,
- dst->drawable,
- gc,
+ XCopyArea (dst->dpy, src->drawable, dst->drawable, gc,
rect.x + src_x,
rect.y + src_y,
rect.width, rect.height,
@@ -2255,9 +2249,6 @@ _cairo_xlib_surface_composite (cairo_operator_t op,
} else {
int n, num_rects;
- src_x += src_attr.x_offset + itx;
- src_y += src_attr.y_offset + ity;
-
num_rects = cairo_region_num_rectangles (clip_region);
for (n = 0; n < num_rects; n++) {
cairo_rectangle_int_t rect;