[cairo-commit] cairo/src cairoint.h, 1.232, 1.233 cairo-image-surface.c, 1.66, 1.67 cairo-font-subset.c, 1.7, 1.8

[Carl Worth]

Committed by: cworth

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

Modified Files:
	cairoint.h cairo-image-surface.c cairo-font-subset.c 
Log Message:
2005-12-16  Carl Worth  <cworth at cworth.org>

        * src/cairoint.h: Don't export cairo_image_surface_set_clip_region.

        * src/cairo-image-surface.c: (_cairo_image_surface_finish),
        (_cairo_image_surface_set_clip_region),
        (_cairo_image_surface_get_extents): Eliminate some unnecessary
        _cairo_image_abstract_surface variations of backend function.

        * src/cairo-font-subset.c: Remove errant include of cairo-pdf.h.


Index: cairoint.h
===================================================================
RCS file: /cvs/cairo/cairo/src/cairoint.h,v
retrieving revision 1.232
retrieving revision 1.233
diff -u -d -r1.232 -r1.233
--- cairoint.h	16 Dec 2005 11:02:35 -0000	1.232
+++ cairoint.h	16 Dec 2005 19:21:24 -0000	1.233
@@ -1845,10 +1845,6 @@
 cairo_private void
 _cairo_image_surface_assume_ownership_of_data (cairo_image_surface_t *surface);
 
-cairo_private cairo_int_status_t
-_cairo_image_surface_set_clip_region (cairo_image_surface_t *surface,
-				      pixman_region16_t *region);
-
 cairo_private cairo_bool_t
 _cairo_surface_is_image (const cairo_surface_t *surface);
 

Index: cairo-image-surface.c
===================================================================
RCS file: /cvs/cairo/cairo/src/cairo-image-surface.c,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -d -r1.66 -r1.67
--- cairo-image-surface.c	16 Dec 2005 11:02:35 -0000	1.66
+++ cairo-image-surface.c	16 Dec 2005 19:21:24 -0000	1.67
@@ -341,7 +341,7 @@
 }
 
 static cairo_status_t
-_cairo_image_abstract_surface_finish (void *abstract_surface)
+_cairo_image_surface_finish (void *abstract_surface)
 {
     cairo_image_surface_t *surface = abstract_surface;
 
@@ -802,18 +802,11 @@
 }
 
 static cairo_int_status_t
-_cairo_image_abstract_surface_set_clip_region (void *abstract_surface,
-					       pixman_region16_t *region)
+_cairo_image_surface_set_clip_region (void *abstract_surface,
+				      pixman_region16_t *region)
 {
     cairo_image_surface_t *surface = (cairo_image_surface_t *) abstract_surface;
 
-    return _cairo_image_surface_set_clip_region (surface, region);
-}
-
-cairo_int_status_t
-_cairo_image_surface_set_clip_region (cairo_image_surface_t *surface,
-				      pixman_region16_t *region)
-{
     pixman_image_set_clip_region (surface->pixman_image, region);
 
     surface->has_clip = region != NULL;
@@ -822,9 +815,11 @@
 }
 
 static cairo_int_status_t
-_cairo_image_surface_get_extents (cairo_image_surface_t *surface,
+_cairo_image_surface_get_extents (void			*abstract_surface,
 				  cairo_rectangle_t	*rectangle)
 {
+    cairo_image_surface_t *surface = abstract_surface;
+
     rectangle->x = 0;
     rectangle->y = 0;
     rectangle->width  = surface->width;
@@ -833,15 +828,6 @@
     return CAIRO_STATUS_SUCCESS;
 }
 
-static cairo_int_status_t
-_cairo_image_abstract_surface_get_extents (void		     *abstract_surface,
-					   cairo_rectangle_t *rectangle)
-{
-    cairo_image_surface_t *surface = abstract_surface;
-
-    return _cairo_image_surface_get_extents (surface, rectangle);
-}
-
 /**
  * _cairo_surface_is_image:
  * @surface: a #cairo_surface_t
@@ -858,7 +844,7 @@
 
 const cairo_surface_backend_t cairo_image_surface_backend = {
     _cairo_image_surface_create_similar,
-    _cairo_image_abstract_surface_finish,
+    _cairo_image_surface_finish,
     _cairo_image_surface_acquire_source_image,
     _cairo_image_surface_release_source_image,
     _cairo_image_surface_acquire_dest_image,
@@ -869,8 +855,8 @@
     _cairo_image_surface_composite_trapezoids,
     NULL, /* copy_page */
     NULL, /* show_page */
-    _cairo_image_abstract_surface_set_clip_region,
+    _cairo_image_surface_set_clip_region,
     NULL, /* intersect_clip_path */
-    _cairo_image_abstract_surface_get_extents,
+    _cairo_image_surface_get_extents,
     NULL /* old_show_glyphs */
 };

Index: cairo-font-subset.c
===================================================================
RCS file: /cvs/cairo/cairo/src/cairo-font-subset.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- cairo-font-subset.c	7 Nov 2005 21:23:32 -0000	1.7
+++ cairo-font-subset.c	16 Dec 2005 19:21:24 -0000	1.8
@@ -34,9 +34,9 @@
  */
 
 #include "cairoint.h"
-#include "cairo-pdf.h"
-/* XXX: Eventually, we need to handle other font backends */
 #include "cairo-font-subset-private.h"
+
+/* XXX: Eventually, we need to handle other font backends */
 #include "cairo-ft-private.h"
 
 #include <ft2build.h>