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

[Uli Schlachter]

 src/cairo-xcb-surface.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit f162f7ebb47fe87ffadade15456699ef2b556fbf
Author: Uli Schlachter <psychon at znc.in>
Date:   Thu Sep 22 22:03:46 2011 +0200

    xcb: Fix device offsets with unmap_image()
    
    The source and target x/y coordinates were swapped. No idea why this only now
    caused a test suite failure, perhaps something recently started using SHM?
    
    Fixes: map-bit-to-image, map-to-image-fill
    
    Signed-off-by: Uli Schlachter <psychon at znc.in>

diff --git a/src/cairo-xcb-surface.c b/src/cairo-xcb-surface.c
index d6bef83..75a1f87 100644
--- a/src/cairo-xcb-surface.c
+++ b/src/cairo-xcb-surface.c
@@ -526,10 +526,10 @@ _put_shm_image (cairo_xcb_surface_t    *surface,
 					 surface->drawable,
 					 gc,
 					 surface->width, surface->height,
+					 0, 0,
+					 image->width, image->height,
 					 image->base.device_transform_inverse.x0,
 					 image->base.device_transform_inverse.y0,
-					 image->width, image->height,
-					 0, 0,
 					 image->depth,
 					 shm_info->shm,
 					 shm_info->offset);
commit 880321ae9d678eac10e336513e7d83096683cd3a
Author: Uli Schlachter <psychon at znc.in>
Date:   Thu Sep 22 20:46:24 2011 +0200

    xcb: Fix a "incompatible pointer" compiler warning
    
    cairo-xcb-surface.c:790:2: warning: return from incompatible pointer type
    
    Signed-off-by: Uli Schlachter <psychon at znc.in>

diff --git a/src/cairo-xcb-surface.c b/src/cairo-xcb-surface.c
index 9664303..d6bef83 100644
--- a/src/cairo-xcb-surface.c
+++ b/src/cairo-xcb-surface.c
@@ -787,7 +787,7 @@ _cairo_xcb_surface_fallback (cairo_xcb_surface_t *surface,
 	    return _cairo_surface_create_in_error (status);
 
     if (surface->fallback)
-	return surface->fallback;
+	return &surface->fallback->base;
 
     image = (cairo_image_surface_t *)
 	    _get_image (surface, TRUE, 0, 0, surface->width, surface->height);