[cairo-commit] 2 commits - src/cairo-surface-wrapper.c src/cairo-xlib-xcb-surface.c

[Uli Schlachter]

 src/cairo-surface-wrapper.c  |    4 ----
 src/cairo-xlib-xcb-surface.c |    2 +-
 2 files changed, 1 insertion(+), 5 deletions(-)

New commits:
commit f7eaf37f0432952ce12708e32e0641fa97bfd715
Author: Uli Schlachter <psychon at znc.in>
Date:   Fri Feb 10 18:00:01 2012 +0100

    Wrapper: Don't translate clips extents' origin
    
    If a bounded recording surface doesn't have its extents .x and .y at the
    surface's origin, this code was translating all clips to make up for that.
    However, the clip already is in device space.
    
    Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=41583
    
    Signed-off-by: Uli Schlachter <psychon at znc.in>
    Reviewed-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/src/cairo-surface-wrapper.c b/src/cairo-surface-wrapper.c
index 00d9aa3..931d11d 100644
--- a/src/cairo-surface-wrapper.c
+++ b/src/cairo-surface-wrapper.c
@@ -122,10 +122,6 @@ _cairo_surface_wrapper_get_clip (cairo_surface_wrapper_t *wrapper,
     copy = _cairo_clip_copy (clip);
     if (wrapper->has_extents) {
 	copy = _cairo_clip_intersect_rectangle (copy, &wrapper->extents);
-	if (wrapper->extents.x | wrapper->extents.y)
-	    copy = _cairo_clip_translate (copy,
-					  -wrapper->extents.x,
-					  -wrapper->extents.y);
     }
     copy = _cairo_clip_transform (copy, &wrapper->transform);
     if (! _cairo_matrix_is_identity (&wrapper->target->device_transform)) {
commit 2f4645db84215f38ca0a19886de56971ce4f2d79
Author: Uli Schlachter <psychon at znc.in>
Date:   Fri Feb 10 17:52:45 2012 +0100

    xlib-xcb: Make this compile again
    
    There was a typo in commit 2061cd81f26.
    
    Signed-off-by: Uli Schlachter <psychon at znc.in>

diff --git a/src/cairo-xlib-xcb-surface.c b/src/cairo-xlib-xcb-surface.c
index 2002fc3..0260a0f 100644
--- a/src/cairo-xlib-xcb-surface.c
+++ b/src/cairo-xlib-xcb-surface.c
@@ -142,7 +142,7 @@ _cairo_xlib_xcb_surface_source (void *abstract_surface,
 				cairo_rectangle_int_t *extents)
 {
     cairo_xlib_xcb_surface_t *surface = abstract_surface;
-    return _cairo_surface_get_source (&surface->cb->base, extents);
+    return _cairo_surface_get_source (&surface->xcb->base, extents);
 }
 
 static cairo_status_t