[cairo-commit] cairo/src cairo-image-surface.c, 1.52, 1.53 cairo-quartz-surface.c, 1.16, 1.17 cairo-xcb-surface.c, 1.42, 1.43 cairo-xlib-surface.c, 1.99, 1.100

[Owen Taylor]

Committed by: otaylor

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

Modified Files:
	cairo-image-surface.c cairo-quartz-surface.c 
	cairo-xcb-surface.c cairo-xlib-surface.c 
Log Message:
2005-07-28  Owen Taylor  <otaylor at redhat.com>

        * src/cairo-image-surface.c (_cairo_image_surface_acquire_source,dest_image)
        src/cairo-quartz-surface.c (_cairo_quartz_surface_acquire_dest_image)
        src/cairo-xcb-surface.c (_cairo_xcb_surface_acquire_source,dest_image):
        src/cairo-xlib-surface.c (_cairo_xlib_surface_acquire_source,dest_image):
        Set image_extra to NULL to avoid purify warnings. (#3777, Stuart Parmenter)


Index: cairo-image-surface.c
===================================================================
RCS file: /cvs/cairo/cairo/src/cairo-image-surface.c,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -d -r1.52 -r1.53
--- cairo-image-surface.c	28 Jul 2005 16:46:38 -0000	1.52
+++ cairo-image-surface.c	28 Jul 2005 16:54:03 -0000	1.53
@@ -349,6 +349,7 @@
 					   void                   **image_extra)
 {
     *image_out = abstract_surface;
+    *image_extra = NULL;
     
     return CAIRO_STATUS_SUCCESS;
 }
@@ -375,7 +376,8 @@
     image_rect_out->height = surface->height;
 
     *image_out = surface;
-
+    *image_extra = NULL;
+    
     return CAIRO_STATUS_SUCCESS;
 }
 

Index: cairo-quartz-surface.c
===================================================================
RCS file: /cvs/cairo/cairo/src/cairo-quartz-surface.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- cairo-quartz-surface.c	28 Jul 2005 16:46:38 -0000	1.16
+++ cairo-quartz-surface.c	28 Jul 2005 16:54:03 -0000	1.17
@@ -152,6 +152,7 @@
     image_rect->height = surface->image->height;
 
     *image_out = surface->image;
+    *image_extra = NULL;
 
     return CAIRO_STATUS_SUCCESS;
 }

Index: cairo-xcb-surface.c
===================================================================
RCS file: /cvs/cairo/cairo/src/cairo-xcb-surface.c,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -d -r1.42 -r1.43
--- cairo-xcb-surface.c	28 Jul 2005 16:46:38 -0000	1.42
+++ cairo-xcb-surface.c	28 Jul 2005 16:54:03 -0000	1.43
@@ -582,6 +582,7 @@
 	return status;
 
     *image_out = image;
+    *image_extra = NULL;
 
     return CAIRO_STATUS_SUCCESS;
 }
@@ -610,6 +611,7 @@
 	return status;
 
     *image_out = image;
+    *image_extra = NULL;
 
     return CAIRO_STATUS_SUCCESS;
 }

Index: cairo-xlib-surface.c
===================================================================
RCS file: /cvs/cairo/cairo/src/cairo-xlib-surface.c,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -d -r1.99 -r1.100
--- cairo-xlib-surface.c	28 Jul 2005 16:46:39 -0000	1.99
+++ cairo-xlib-surface.c	28 Jul 2005 16:54:03 -0000	1.100
@@ -589,6 +589,7 @@
 	return status;
 
     *image_out = image;
+    *image_extra = NULL;
 
     return CAIRO_STATUS_SUCCESS;
 }
@@ -617,7 +618,8 @@
 	return status;
 
     *image_out = image;
-
+    *image_extra = NULL;
+    
     return CAIRO_STATUS_SUCCESS;
 }