? cairo-public-meta-surface.h ? cairo-svg-document-finish.patch ? cairo-svg-pageset.patch ? warn Index: cairo-meta-surface-private.h =================================================================== RCS file: /cvs/cairo/cairo/src/cairo-meta-surface-private.h,v retrieving revision 1.12 diff -u -p -u -r1.12 cairo-meta-surface-private.h --- cairo-meta-surface-private.h 18 Jan 2006 01:01:39 -0000 1.12 +++ cairo-meta-surface-private.h 31 Jan 2006 17:08:42 -0000 @@ -139,14 +139,14 @@ typedef struct _cairo_meta_surface { cairo_surface_t *commands_owner; } cairo_meta_surface_t; -cairo_private cairo_surface_t * -_cairo_meta_surface_create (cairo_content_t content, - int width_pixels, - int height_pixels); +cairo_public cairo_surface_t * +cairo_meta_surface_create (cairo_content_t content, + int width_pixels, + int height_pixels); -cairo_private cairo_status_t -_cairo_meta_surface_replay (cairo_surface_t *surface, - cairo_surface_t *target); +cairo_public cairo_status_t +cairo_meta_surface_replay (cairo_surface_t *surface, + cairo_surface_t *target); cairo_private cairo_bool_t _cairo_surface_is_meta (const cairo_surface_t *surface); Index: cairo-meta-surface.c =================================================================== RCS file: /cvs/cairo/cairo/src/cairo-meta-surface.c,v retrieving revision 1.25 diff -u -p -u -r1.25 cairo-meta-surface.c --- cairo-meta-surface.c 18 Jan 2006 01:01:39 -0000 1.25 +++ cairo-meta-surface.c 31 Jan 2006 17:08:43 -0000 @@ -39,7 +39,7 @@ * level of paint, mask, stroke, fill, and show_glyphs). The meta * surface can then be "replayed" against any target surface with: * - * _cairo_meta_surface_replay (meta, target); + * cairo_meta_surface_replay (meta, target); * * after which the results in target will be identical to the results * that would have been obtained if the original operations applied to @@ -60,9 +60,9 @@ static const cairo_surface_backend_t cairo_meta_surface_backend; cairo_surface_t * -_cairo_meta_surface_create (cairo_content_t content, - int width_pixels, - int height_pixels) +cairo_meta_surface_create (cairo_content_t content, + int width_pixels, + int height_pixels) { cairo_meta_surface_t *meta; @@ -90,7 +90,7 @@ _cairo_meta_surface_create_similar (void int width, int height) { - return _cairo_meta_surface_create (content, width, height); + return cairo_meta_surface_create (content, width, height); } static cairo_status_t @@ -175,7 +175,7 @@ _cairo_meta_surface_acquire_source_image surface->width_pixels, surface->height_pixels); - status = _cairo_meta_surface_replay (&surface->base, image); + status = cairo_meta_surface_replay (&surface->base, image); if (status) { cairo_surface_destroy (image); return status; @@ -593,8 +593,8 @@ static const cairo_surface_backend_t cai }; cairo_status_t -_cairo_meta_surface_replay (cairo_surface_t *surface, - cairo_surface_t *target) +cairo_meta_surface_replay (cairo_surface_t *surface, + cairo_surface_t *target) { cairo_meta_surface_t *meta; cairo_command_t *command, **elements; Index: cairo-paginated-surface.c =================================================================== RCS file: /cvs/cairo/cairo/src/cairo-paginated-surface.c,v retrieving revision 1.11 diff -u -p -u -r1.11 cairo-paginated-surface.c --- cairo-paginated-surface.c 21 Jan 2006 17:39:11 -0000 1.11 +++ cairo-paginated-surface.c 31 Jan 2006 17:08:43 -0000 @@ -75,7 +75,7 @@ typedef struct _cairo_paginated_surface cairo_content_t content; /* XXX: These shouldn't actually exist. We inherit this ugliness - * from _cairo_meta_surface_create. The width/height parameters + * from cairo_meta_surface_create. The width/height parameters * from that function also should not exist. The fix that will * allow us to remove all of these is to fix acquire_source_image * to pass an interest rectangle. */ @@ -117,7 +117,7 @@ _cairo_paginated_surface_create (cairo_s surface->target = target; - surface->meta = _cairo_meta_surface_create (content, width, height); + surface->meta = cairo_meta_surface_create (content, width, height); if (cairo_surface_status (surface->meta)) goto FAIL_CLEANUP_SURFACE; @@ -175,7 +175,7 @@ _cairo_paginated_surface_acquire_source_ extents.width, extents.height); - _cairo_meta_surface_replay (surface->meta, image); + cairo_meta_surface_replay (surface->meta, image); *image_out = (cairo_image_surface_t*) image; *image_extra = NULL; @@ -201,7 +201,7 @@ _paint_page (cairo_paginated_surface_t * surface->width, surface->height); - _cairo_meta_surface_replay (surface->meta, image); + cairo_meta_surface_replay (surface->meta, image); pattern = cairo_pattern_create_for_surface (image); @@ -243,8 +243,8 @@ _cairo_paginated_surface_show_page (void cairo_surface_destroy (surface->meta); - surface->meta = _cairo_meta_surface_create (surface->content, - surface->width, surface->height); + surface->meta = cairo_meta_surface_create (surface->content, + surface->width, surface->height); if (cairo_surface_status (surface->meta)) return cairo_surface_status (surface->meta); @@ -374,7 +374,7 @@ _cairo_paginated_surface_snapshot (void extents.width, extents.height); - _cairo_meta_surface_replay (other->meta, surface); + cairo_meta_surface_replay (other->meta, surface); return surface; #endif Index: test-meta-surface.c =================================================================== RCS file: /cvs/cairo/cairo/src/test-meta-surface.c,v retrieving revision 1.4 diff -u -p -u -r1.4 test-meta-surface.c --- test-meta-surface.c 18 Jan 2006 01:01:40 -0000 1.4 +++ test-meta-surface.c 31 Jan 2006 17:08:43 -0000 @@ -80,7 +80,7 @@ _test_meta_surface_create (cairo_content _cairo_surface_init (&surface->base, &test_meta_surface_backend); - surface->meta = _cairo_meta_surface_create (content, width, height); + surface->meta = cairo_meta_surface_create (content, width, height); if (cairo_surface_status (surface->meta)) goto FAIL_CLEANUP_SURFACE; @@ -146,7 +146,7 @@ _test_meta_surface_show_page (void *abst if (surface->image_reflects_meta) return CAIRO_STATUS_SUCCESS; - _cairo_meta_surface_replay (surface->meta, surface->image); + cairo_meta_surface_replay (surface->meta, surface->image); surface->image_reflects_meta = TRUE; @@ -289,7 +289,7 @@ _test_meta_surface_snapshot (void *abstr extents.width, extents.height); - _cairo_meta_surface_replay (other->meta, surface); + cairo_meta_surface_replay (other->meta, surface); return surface; #endif