[cairo-commit] cairo/src cairo-glitz-surface.c, 1.44, 1.45 cairo-image-surface.c, 1.44, 1.45 cairo-pdf-surface.c, 1.44, 1.45 cairo-ps-surface.c, 1.35, 1.36 cairo-quartz-surface.c, 1.10, 1.11 cairo-surface.c, 1.72, 1.73 cairo-win32-surface.c, 1.24, 1.25 cairo-xcb-surface.c, 1.34, 1.35 cairo-xlib-surface.c, 1.77, 1.78 cairoint.h, 1.153, 1.154

Carl Worth commit at pdx.freedesktop.org
Tue Jun 14 15:38:18 PDT 2005


Committed by: cworth

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

Modified Files:
	cairo-glitz-surface.c cairo-image-surface.c 
	cairo-pdf-surface.c cairo-ps-surface.c cairo-quartz-surface.c 
	cairo-surface.c cairo-win32-surface.c cairo-xcb-surface.c 
	cairo-xlib-surface.c cairoint.h 
Log Message:

        * src/cairo-glitz-surface.c: (_cairo_glitz_surface_create_similar),
        (_cairo_glitz_surface_clone_similar),
        (_cairo_glitz_pattern_acquire_surface),
        (_cairo_glitz_surface_composite_trapezoids):
        * src/cairo-image-surface.c: (_cairo_image_surface_create_similar):
        * src/cairo-pdf-surface.c: (_cairo_pdf_surface_create_similar):
        * src/cairo-ps-surface.c: (_cairo_ps_surface_create_similar):
        * src/cairo-quartz-surface.c:
        (_cairo_quartz_surface_create_similar):
        * src/cairo-surface.c: (_cairo_surface_create_similar_scratch),
        (_cairo_surface_create_similar_solid):
        * src/cairo-win32-surface.c: (_cairo_win32_surface_create_similar),
        (_cairo_win32_surface_get_subimage):
        * src/cairo-xcb-surface.c: (_cairo_xcb_surface_create_similar),
        (_cairo_xcb_surface_clone_similar):
        * src/cairo-xlib-surface.c: (_cairo_xlib_surface_create_similar),
        (_cairo_xlib_surface_clone_similar):
        * src/cairoint.h: Remove Boolean 'drawable' parameter from the
        create_similar surface backend function since nothing anywhere is
        actually using this parameter.


Index: cairo-glitz-surface.c
===================================================================
RCS file: /cvs/cairo/cairo/src/cairo-glitz-surface.c,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -d -r1.44 -r1.45
--- cairo-glitz-surface.c	10 Jun 2005 19:18:21 -0000	1.44
+++ cairo-glitz-surface.c	14 Jun 2005 22:38:15 -0000	1.45
@@ -70,7 +70,6 @@
 static cairo_surface_t *
 _cairo_glitz_surface_create_similar (void	    *abstract_src,
 				     cairo_format_t format,
-				     int	    draw,
 				     int	    width,
 				     int	    height)
 {
@@ -356,7 +355,7 @@
 	cairo_image_surface_t *image_src = (cairo_image_surface_t *) src;
     
 	clone = (cairo_glitz_surface_t *)
-	    _cairo_glitz_surface_create_similar (surface, image_src->format, 0,
+	    _cairo_glitz_surface_create_similar (surface, image_src->format,
 						 image_src->width,
 						 image_src->height);
 	if (!clone)
@@ -602,7 +601,7 @@
 
 	src = (cairo_glitz_surface_t *)
 	    _cairo_surface_create_similar_scratch (&dst->base,
-						   CAIRO_FORMAT_ARGB32, 0,
+						   CAIRO_FORMAT_ARGB32,
 						   gradient->n_stops, 1);
 	if (!src)
 	{
@@ -1035,7 +1034,7 @@
 
 	mask = (cairo_glitz_surface_t *)
 	    _cairo_glitz_surface_create_similar (&dst->base,
-						 CAIRO_FORMAT_A8, 0,
+						 CAIRO_FORMAT_A8,
 						 2, 1);
 	if (!mask)
 	{
@@ -1135,7 +1134,7 @@
 
 	mask = (cairo_glitz_surface_t *)
 	    _cairo_surface_create_similar_scratch (&dst->base,
-						   CAIRO_FORMAT_A8, 0,
+						   CAIRO_FORMAT_A8,
 						   width, height);
 	if (!mask)
 	{

Index: cairo-image-surface.c
===================================================================
RCS file: /cvs/cairo/cairo/src/cairo-image-surface.c,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -d -r1.44 -r1.45
--- cairo-image-surface.c	10 Jun 2005 19:18:21 -0000	1.44
+++ cairo-image-surface.c	14 Jun 2005 22:38:15 -0000	1.45
@@ -259,7 +259,6 @@
 static cairo_surface_t *
 _cairo_image_surface_create_similar (void		*abstract_src,
 				     cairo_format_t	format,
-				     int		drawable,
 				     int		width,
 				     int		height)
 {

Index: cairo-pdf-surface.c
===================================================================
RCS file: /cvs/cairo/cairo/src/cairo-pdf-surface.c,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -d -r1.44 -r1.45
--- cairo-pdf-surface.c	10 Jun 2005 19:46:49 -0000	1.44
+++ cairo-pdf-surface.c	14 Jun 2005 22:38:15 -0000	1.45
@@ -1015,7 +1015,6 @@
 static cairo_surface_t *
 _cairo_pdf_surface_create_similar (void			*abstract_src,
 				   cairo_format_t	format,
-				   int			drawable,
 				   int			width,
 				   int			height)
 {

Index: cairo-ps-surface.c
===================================================================
RCS file: /cvs/cairo/cairo/src/cairo-ps-surface.c,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -d -r1.35 -r1.36
--- cairo-ps-surface.c	17 May 2005 12:58:02 -0000	1.35
+++ cairo-ps-surface.c	14 Jun 2005 22:38:15 -0000	1.36
@@ -159,7 +159,6 @@
 static cairo_surface_t *
 _cairo_ps_surface_create_similar (void		*abstract_src,
 				 cairo_format_t	format,
-				 int		drawable,
 				 int		width,
 				 int		height)
 {

Index: cairo-quartz-surface.c
===================================================================
RCS file: /cvs/cairo/cairo/src/cairo-quartz-surface.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- cairo-quartz-surface.c	11 May 2005 22:39:26 -0000	1.10
+++ cairo-quartz-surface.c	14 Jun 2005 22:38:15 -0000	1.11
@@ -62,7 +62,6 @@
                                                              *abstract_src,
                                                              cairo_format_t
                                                              format,
-                                                             int drawable,
                                                              int width,
                                                              int height)
 {

Index: cairo-surface.c
===================================================================
RCS file: /cvs/cairo/cairo/src/cairo-surface.c,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -d -r1.72 -r1.73
--- cairo-surface.c	10 Jun 2005 19:18:21 -0000	1.72
+++ cairo-surface.c	14 Jun 2005 22:38:15 -0000	1.73
@@ -65,15 +65,13 @@
 cairo_surface_t *
 _cairo_surface_create_similar_scratch (cairo_surface_t	*other,
 				       cairo_format_t	format,
-				       int		drawable,
 				       int		width,
 				       int		height)
 {
     if (other == NULL)
 	return NULL;
 
-    return other->backend->create_similar (other, format, drawable,
-					   width, height);
+    return other->backend->create_similar (other, format, width, height);
 }
 
 cairo_surface_t *
@@ -100,7 +98,7 @@
     cairo_status_t status;
     cairo_surface_t *surface;
 
-    surface = _cairo_surface_create_similar_scratch (other, format, 1,
+    surface = _cairo_surface_create_similar_scratch (other, format,
 						     width, height);
     
     if (surface == NULL)

Index: cairo-win32-surface.c
===================================================================
RCS file: /cvs/cairo/cairo/src/cairo-win32-surface.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- cairo-win32-surface.c	10 Jun 2005 19:18:21 -0000	1.24
+++ cairo-win32-surface.c	14 Jun 2005 22:38:15 -0000	1.25
@@ -292,7 +292,6 @@
 static cairo_surface_t *
 _cairo_win32_surface_create_similar (void	    *abstract_src,
 				     cairo_format_t  format,
-				     int	     drawable,
 				     int	     width,
 				     int	     height)
 {
@@ -359,7 +358,6 @@
     local = 
 	(cairo_win32_surface_t *) _cairo_win32_surface_create_similar (surface,
 								       surface->format,
-								       0,
 								       width, height);
     if (!local)
 	return CAIRO_STATUS_NO_MEMORY;

Index: cairo-xcb-surface.c
===================================================================
RCS file: /cvs/cairo/cairo/src/cairo-xcb-surface.c,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- cairo-xcb-surface.c	10 Jun 2005 19:46:49 -0000	1.34
+++ cairo-xcb-surface.c	14 Jun 2005 22:38:15 -0000	1.35
@@ -229,7 +229,6 @@
 static cairo_surface_t *
 _cairo_xcb_surface_create_similar (void		       *abstract_src,
 				   cairo_format_t	format,
-				   int			drawable,
 				   int			width,
 				   int			height)
 {
@@ -641,7 +640,7 @@
 	cairo_image_surface_t *image_src = (cairo_image_surface_t *)src;
     
 	clone = (cairo_xcb_surface_t *)
-	    _cairo_xcb_surface_create_similar (surface, image_src->format, 0,
+	    _cairo_xcb_surface_create_similar (surface, image_src->format,
 					       image_src->width, image_src->height);
 	if (clone == NULL)
 	    return CAIRO_STATUS_NO_MEMORY;

Index: cairo-xlib-surface.c
===================================================================
RCS file: /cvs/cairo/cairo/src/cairo-xlib-surface.c,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -d -r1.77 -r1.78
--- cairo-xlib-surface.c	10 Jun 2005 19:46:49 -0000	1.77
+++ cairo-xlib-surface.c	14 Jun 2005 22:38:15 -0000	1.78
@@ -165,7 +165,6 @@
 static cairo_surface_t *
 _cairo_xlib_surface_create_similar (void		*abstract_src,
 				    cairo_format_t	format,
-				    int			drawable,
 				    int			width,
 				    int			height)
 {
@@ -602,7 +601,7 @@
 	cairo_image_surface_t *image_src = (cairo_image_surface_t *)src;
     
 	clone = (cairo_xlib_surface_t *)
-	    _cairo_xlib_surface_create_similar (surface, image_src->format, 0,
+	    _cairo_xlib_surface_create_similar (surface, image_src->format,
 						image_src->width, image_src->height);
 	if (clone == NULL)
 	    return CAIRO_STATUS_NO_MEMORY;

Index: cairoint.h
===================================================================
RCS file: /cvs/cairo/cairo/src/cairoint.h,v
retrieving revision 1.153
retrieving revision 1.154
diff -u -d -r1.153 -r1.154
--- cairoint.h	13 Jun 2005 23:53:52 -0000	1.153
+++ cairoint.h	14 Jun 2005 22:38:15 -0000	1.154
@@ -565,7 +565,6 @@
     cairo_surface_t *
     (*create_similar)		(void			*surface,
 				 cairo_format_t		 format,
-				 int                     drawable,
 				 int			 width,
 				 int			 height);
 
@@ -1368,7 +1367,6 @@
 cairo_private cairo_surface_t *
 _cairo_surface_create_similar_scratch (cairo_surface_t	*other,
 				       cairo_format_t	format,
-				       int		drawable,
 				       int		width,
 				       int		height);
 




More information about the cairo-commit mailing list