[cairo-commit] cairo/src cairo.h, 1.73, 1.74 cairo_pattern.c, 1.19, 1.20

[Carl Worth]

Committed by: cworth

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

Modified Files:
	cairo.h cairo_pattern.c 
Log Message:

        * src/cairo_pattern.c (cairo_pattern_reference):
        * src/cairo.h: Revert accidental commit.


Index: cairo.h
===================================================================
RCS file: /cvs/cairo/cairo/src/cairo.h,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -d -r1.73 -r1.74
--- cairo.h	21 Feb 2005 16:17:42 -0000	1.73
+++ cairo.h	21 Feb 2005 16:22:47 -0000	1.74
@@ -774,14 +774,6 @@
 				     int			height,
 				     int			stride);
 
-void
-cairo_image_surface_get_data (cairo_surface_t	*surface,
-			      char		**data,
-			      cairo_format_t	*format,
-			      int		*width,
-			      int		*height,
-			      int		*stride);
-
 /* Pattern creation functions */
 cairo_pattern_t *
 cairo_pattern_create_for_surface (cairo_surface_t *surface);
@@ -794,7 +786,7 @@
 cairo_pattern_create_radial (double cx0, double cy0, double radius0,
 			     double cx1, double cy1, double radius1);
 
-cairo_pattern_t *
+void
 cairo_pattern_reference (cairo_pattern_t *pattern);
 
 void

Index: cairo_pattern.c
===================================================================
RCS file: /cvs/cairo/cairo/src/cairo_pattern.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- cairo_pattern.c	21 Feb 2005 16:17:42 -0000	1.19
+++ cairo_pattern.c	21 Feb 2005 16:22:47 -0000	1.20
@@ -172,15 +172,13 @@
     return pattern;
 }
 
-cairo_pattern_t *
+void
 cairo_pattern_reference (cairo_pattern_t *pattern)
 {
     if (pattern == NULL)
-	return NULL;
+	return;
 
     pattern->ref_count++;
-
-    return pattern;
 }
 
 void