[cairo-commit] cairo/src cairo-glitz-surface.c, 1.46, 1.47 cairo-image-surface.c, 1.46, 1.47 cairo-pattern.c, 1.44, 1.45 cairo-pdf-surface.c, 1.46, 1.47 cairo-surface.c, 1.75, 1.76 cairo-xlib-surface.c, 1.79, 1.80 cairoint.h, 1.155, 1.156

Kristian Hogsberg commit at pdx.freedesktop.org
Fri Jun 17 13:25:22 PDT 2005


Committed by: krh

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

Modified Files:
	cairo-glitz-surface.c cairo-image-surface.c cairo-pattern.c 
	cairo-pdf-surface.c cairo-surface.c cairo-xlib-surface.c 
	cairoint.h 
Log Message:
2005-06-17  Kristian Høgsberg  <krh at redhat.com>

        * src/cairo-glitz-surface.c: (_cairo_glitz_surface_get_image):
        * src/cairo-pattern.c: (cairo_pattern_create_for_surface):
        * src/cairo-pdf-surface.c: (_cairo_pdf_surface_composite_pdf):
        * src/cairo-surface.c: (_cairo_surface_init):
        * src/cairo-xlib-surface.c: (_get_image_surface):
        * src/cairoint.h: Remove matrix, filter and repeat from the
        cairo_surface_t struct.



Index: cairo-glitz-surface.c
===================================================================
RCS file: /cvs/cairo/cairo/src/cairo-glitz-surface.c,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -d -r1.46 -r1.47
--- cairo-glitz-surface.c	15 Jun 2005 02:45:23 -0000	1.46
+++ cairo-glitz-surface.c	17 Jun 2005 20:25:19 -0000	1.47
@@ -214,9 +214,6 @@
 
     _cairo_image_surface_assume_ownership_of_data (image);
 
-    _cairo_image_surface_set_repeat (image, surface->base.repeat);
-    _cairo_image_surface_set_matrix (image, &(surface->base.matrix));
-
     *image_out = image;
 
     return CAIRO_STATUS_SUCCESS;

Index: cairo-image-surface.c
===================================================================
RCS file: /cvs/cairo/cairo/src/cairo-image-surface.c,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -d -r1.46 -r1.47
--- cairo-image-surface.c	15 Jun 2005 02:45:23 -0000	1.46
+++ cairo-image-surface.c	17 Jun 2005 20:25:19 -0000	1.47
@@ -351,7 +351,7 @@
     return CAIRO_INT_STATUS_UNSUPPORTED;
 }
 
-cairo_status_t
+static cairo_status_t
 _cairo_image_surface_set_matrix (cairo_image_surface_t	*surface,
 				 const cairo_matrix_t	*matrix)
 {
@@ -374,7 +374,7 @@
     return CAIRO_STATUS_SUCCESS;
 }
 
-cairo_status_t
+static cairo_status_t
 _cairo_image_surface_set_filter (cairo_image_surface_t *surface, cairo_filter_t filter)
 {
     pixman_filter_t pixman_filter;
@@ -404,7 +404,7 @@
     return CAIRO_STATUS_SUCCESS;
 }
 
-cairo_status_t
+static cairo_status_t
 _cairo_image_surface_set_repeat (cairo_image_surface_t *surface, int repeat)
 {
     pixman_image_set_repeat (surface->pixman_image, repeat);

Index: cairo-pattern.c
===================================================================
RCS file: /cvs/cairo/cairo/src/cairo-pattern.c,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -d -r1.44 -r1.45
--- cairo-pattern.c	13 Jun 2005 23:53:52 -0000	1.44
+++ cairo-pattern.c	17 Jun 2005 20:25:19 -0000	1.45
@@ -305,12 +305,6 @@
 
     _cairo_pattern_init_for_surface (pattern, surface);
 
-    /* this will go away when we completely remove the surface attributes */
-    if (surface->repeat)
-	pattern->base.extend = CAIRO_EXTEND_REPEAT;
-    else
-	pattern->base.extend = CAIRO_EXTEND_DEFAULT;
-
     return &pattern->base;
 }
 

Index: cairo-pdf-surface.c
===================================================================
RCS file: /cvs/cairo/cairo/src/cairo-pdf-surface.c,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -d -r1.46 -r1.47
--- cairo-pdf-surface.c	15 Jun 2005 02:45:23 -0000	1.46
+++ cairo-pdf-surface.c	17 Jun 2005 20:25:19 -0000	1.47
@@ -1286,7 +1286,7 @@
 
     src = (cairo_pdf_surface_t *) pattern->surface;
 
-    i2u = src->base.matrix;
+    i2u = pattern->base.matrix;
     cairo_matrix_invert (&i2u);
     cairo_matrix_scale (&i2u, 1.0 / src->width, 1.0 / src->height);
 

Index: cairo-surface.c
===================================================================
RCS file: /cvs/cairo/cairo/src/cairo-surface.c,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -d -r1.75 -r1.76
--- cairo-surface.c	15 Jun 2005 23:52:11 -0000	1.75
+++ cairo-surface.c	17 Jun 2005 20:25:19 -0000	1.76
@@ -51,10 +51,6 @@
 
     _cairo_user_data_array_init (&surface->user_data);
 
-    cairo_matrix_init_identity (&surface->matrix);
-    surface->filter = CAIRO_FILTER_GOOD;
-    surface->repeat = 0;
-
     surface->device_x_offset = 0;
     surface->device_y_offset = 0;
 

Index: cairo-xlib-surface.c
===================================================================
RCS file: /cvs/cairo/cairo/src/cairo-xlib-surface.c,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -d -r1.79 -r1.80
--- cairo-xlib-surface.c	15 Jun 2005 02:45:23 -0000	1.79
+++ cairo-xlib-surface.c	17 Jun 2005 20:25:19 -0000	1.80
@@ -435,9 +435,6 @@
     ximage->data = NULL;
     XDestroyImage (ximage);
      
-    _cairo_image_surface_set_repeat (image, surface->base.repeat);
-    _cairo_image_surface_set_matrix (image, &(surface->base.matrix));
-
     *image_out = image;
     return CAIRO_STATUS_SUCCESS;
 }

Index: cairoint.h
===================================================================
RCS file: /cvs/cairo/cairo/src/cairoint.h,v
retrieving revision 1.155
retrieving revision 1.156
diff -u -d -r1.155 -r1.156
--- cairoint.h	15 Jun 2005 02:45:23 -0000	1.155
+++ cairoint.h	17 Jun 2005 20:25:19 -0000	1.156
@@ -743,10 +743,6 @@
     cairo_bool_t finished;
     cairo_user_data_array_t user_data;
 
-    cairo_matrix_t matrix;
-    cairo_filter_t filter;
-    int repeat;
-
     double device_x_offset;
     double device_y_offset;
 
@@ -1562,18 +1558,6 @@
 cairo_private void
 _cairo_image_surface_assume_ownership_of_data (cairo_image_surface_t *surface);
 
-cairo_private cairo_status_t
-_cairo_image_surface_set_matrix (cairo_image_surface_t	*surface,
-				 const cairo_matrix_t	*matrix);
-
-cairo_private cairo_status_t
-_cairo_image_surface_set_filter (cairo_image_surface_t	*surface,
-				 cairo_filter_t		filter);
-
-cairo_private cairo_status_t
-_cairo_image_surface_set_repeat (cairo_image_surface_t	*surface,
-				 int			repeat);
-
 cairo_private cairo_int_status_t
 _cairo_image_surface_set_clip_region (cairo_image_surface_t *surface,
 				      pixman_region16_t *region);




More information about the cairo-commit mailing list