[cairo-commit] cairo/src cairo.h, 1.72, 1.73 cairo_pattern.c, 1.18, 1.19 cairo_surface.c, 1.40, 1.41

[Carl Worth]

Committed by: cworth

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

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

        * src/cairo_surface.c (_fallback_composite_trapezoids): Fix y
        offset to use dst_y instead of dst_x, (caught by David Reveman).


Index: cairo.h
===================================================================
RCS file: /cvs/cairo/cairo/src/cairo.h,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -d -r1.72 -r1.73
--- cairo.h	3 Feb 2005 07:14:55 -0000	1.72
+++ cairo.h	21 Feb 2005 16:17:42 -0000	1.73
@@ -170,6 +170,7 @@
     CAIRO_FORMAT_A1
 } cairo_format_t;
 
+/* XXX: Need to add cairo_set_target_image_data */
 void
 cairo_set_target_image (cairo_t	*cr,
 			char		*data,
@@ -773,6 +774,14 @@
 				     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);
@@ -785,7 +794,7 @@
 cairo_pattern_create_radial (double cx0, double cy0, double radius0,
 			     double cx1, double cy1, double radius1);
 
-void
+cairo_pattern_t *
 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.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- cairo_pattern.c	31 Jan 2005 16:50:22 -0000	1.18
+++ cairo_pattern.c	21 Feb 2005 16:17:42 -0000	1.19
@@ -172,13 +172,15 @@
     return pattern;
 }
 
-void
+cairo_pattern_t *
 cairo_pattern_reference (cairo_pattern_t *pattern)
 {
     if (pattern == NULL)
-	return;
+	return NULL;
 
     pattern->ref_count++;
+
+    return pattern;
 }
 
 void

Index: cairo_surface.c
===================================================================
RCS file: /cvs/cairo/cairo/src/cairo_surface.c,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -d -r1.40 -r1.41
--- cairo_surface.c	1 Feb 2005 00:11:37 -0000	1.40
+++ cairo_surface.c	21 Feb 2005 16:17:42 -0000	1.41
@@ -630,7 +630,7 @@
 						     &state.image->base,
 						     src_x, src_y,
 						     dst_x - state.image_rect.x,
-						     dst_x - state.image_rect.y,
+						     dst_y - state.image_rect.y,
 						     width, height, traps, num_traps);
     if (offset_traps)
 	free (offset_traps);