[cairo-commit] cairo/src cairo-xcb-surface.c,1.24,1.25

[Carl Worth]

Committed by: cworth

Update of /cvs/cairo/cairo/src
In directory gabe:/tmp/cvs-serv24577/src

Modified Files:
	cairo-xcb-surface.c 
Log Message:

        Update xcb backend to compile after recent API changes:

        * src/cairo-xcb-surface.c: (_cairo_xcb_surface_finish):
        Fix missing return value.
        (_cairo_xcb_surface_acquire_source_image): Remove calls to
        non-existent cairo_surface functions.
        (_cairo_xcb_surface_set_matrix): Update for new matrix member names.
        (_cairo_xcb_surface_get_extents): Fix typo.


Index: cairo-xcb-surface.c
===================================================================
RCS file: /cvs/cairo/cairo/src/cairo-xcb-surface.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- cairo-xcb-surface.c	7 May 2005 04:19:50 -0000	1.24
+++ cairo-xcb-surface.c	13 May 2005 06:09:58 -0000	1.25
@@ -247,7 +247,7 @@
     return &surface->base;
 }
 
-static void
+static cairo_status_t
 _cairo_xcb_surface_finish (void *abstract_surface)
 {
     cairo_xcb_surface_t *surface = abstract_surface;
@@ -261,6 +261,8 @@
 	XCBFreeGC (surface->dpy, surface->gc);
 
     surface->dpy = 0;
+
+    return CAIRO_STATUS_SUCCESS;
 }
 
 static int
@@ -426,13 +428,8 @@
     cairo_status_t status;
 
     status = _get_image_surface (surface, NULL, &image, NULL);
-    if (status == CAIRO_STATUS_SUCCESS) {
-	cairo_surface_set_filter (&image->base, surface->base.filter);
-	cairo_surface_set_matrix (&image->base, &surface->base.matrix);
-	cairo_surface_set_repeat (&image->base, surface->base.repeat);
-
+    if (status == CAIRO_STATUS_SUCCESS)
 	*image_out = image;
-    }
 
     return status;
 }
@@ -523,13 +520,13 @@
     if (!surface->picture.xid)
 	return CAIRO_STATUS_SUCCESS;
 
-    xtransform.matrix11 = _cairo_fixed_from_double (matrix->m[0][0]);
-    xtransform.matrix12 = _cairo_fixed_from_double (matrix->m[1][0]);
-    xtransform.matrix13 = _cairo_fixed_from_double (matrix->m[2][0]);
+    xtransform.matrix11 = _cairo_fixed_from_double (matrix->xx);
+    xtransform.matrix12 = _cairo_fixed_from_double (matrix->xy);
+    xtransform.matrix13 = _cairo_fixed_from_double (matrix->x0);
 
-    xtransform.matrix21 = _cairo_fixed_from_double (matrix->m[0][1]);
-    xtransform.matrix22 = _cairo_fixed_from_double (matrix->m[1][1]);
-    xtransform.matrix23 = _cairo_fixed_from_double (matrix->m[2][1]);
+    xtransform.matrix21 = _cairo_fixed_from_double (matrix->yx);
+    xtransform.matrix22 = _cairo_fixed_from_double (matrix->yy);
+    xtransform.matrix23 = _cairo_fixed_from_double (matrix->y0);
 
     xtransform.matrix31 = 0;
     xtransform.matrix32 = 0;
@@ -852,7 +849,7 @@
 _cairo_xcb_surface_get_extents (void		  *abstract_surface,
 				cairo_rectangle_t *rectangle)
 {
-    cairo_xlib_surface_t *surface = abstract_surface;
+    cairo_xcb_surface_t *surface = abstract_surface;
 
     rectangle->x = 0;
     rectangle->y = 0;