[cairo-commit] cairo/src cairo-atsui-font.c, 1.14, 1.15 cairo-quartz-surface.c, 1.17, 1.18

[Tim Rowley]

Committed by: tor

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

Modified Files:
	cairo-atsui-font.c cairo-quartz-surface.c 
Log Message:
	* src/cairo-atsui-font.c ( _cairo_atsui_font_create):
        src/cairo-quartz-surface.c (_cairo_quartz_surface_acquire_dest_image):
	Minor updates to keep quartz backend limping along.


Index: cairo-atsui-font.c
===================================================================
RCS file: /cvs/cairo/cairo/src/cairo-atsui-font.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- cairo-atsui-font.c	27 Jul 2005 22:39:35 -0000	1.14
+++ cairo-atsui-font.c	29 Jul 2005 22:31:48 -0000	1.15
@@ -110,6 +110,7 @@
 			 cairo_font_weight_t weight,
 			 const cairo_matrix_t *font_matrix,
 			 const cairo_matrix_t *ctm,
+			 const cairo_font_options_t *options,
 			 cairo_scaled_font_t **font_out)
 {
     cairo_atsui_font_t *font = NULL;

Index: cairo-quartz-surface.c
===================================================================
RCS file: /cvs/cairo/cairo/src/cairo-quartz-surface.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- cairo-quartz-surface.c	28 Jul 2005 16:54:03 -0000	1.17
+++ cairo-quartz-surface.c	29 Jul 2005 22:31:48 -0000	1.18
@@ -152,7 +152,8 @@
     image_rect->height = surface->image->height;
 
     *image_out = surface->image;
-    *image_extra = NULL;
+    if (image_extra)
+	*image_extra = NULL;
 
     return CAIRO_STATUS_SUCCESS;
 }