[cairo-commit] cairo/src cairo-quartz-surface.c,1.13,1.14

[Carl Worth]

Committed by: cworth

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

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

        * src/cairo-quartz-surface.c:
        (_cairo_quartz_surface_acquire_source_image),
        (_cairo_quartz_surface_set_clip_region): Fix the quartz backend so
        that it at least compiles again. This change is slipped in before
        0.5.2 was pushed out and tagged.


Index: cairo-quartz-surface.c
===================================================================
RCS file: /cvs/cairo/cairo/src/cairo-quartz-surface.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- cairo-quartz-surface.c	8 Jul 2005 17:12:29 -0000	1.13
+++ cairo-quartz-surface.c	18 Jul 2005 16:23:34 -0000	1.14
@@ -134,12 +134,6 @@
                                             surface->width,
                                             surface->height, rowBytes);
 
-
-    // Set the image surface Cairo state to match our own. 
-    _cairo_image_surface_set_repeat(surface->image, surface->base.repeat);
-    _cairo_image_surface_set_matrix(surface->image,
-                                    &(surface->base.matrix));
-
     *image_out = surface->image;
     *image_extra = NULL;
 
@@ -193,8 +187,11 @@
                                       pixman_region16_t * region)
 {
     cairo_quartz_surface_t *surface = abstract_surface;
+    unsigned int serial;
 
-    return _cairo_surface_set_clip_region(&surface->image->base, region);
+    serial = _cairo_surface_allocate_clip_serial (&surface->image->base);
+    return _cairo_surface_set_clip_region(&surface->image->base,
+					  region, serial);
 }
 
 static cairo_int_status_t