From e23d179e08367dc03c5c8f242bbc3af0749d4920 Mon Sep 17 00:00:00 2001 From: Chris Wilson Date: Fri, 1 Jun 2012 17:46:25 +0100 Subject: [PATCH] Erradicate internal use of cairo_surface_get_content() Signed-off-by: Chris Wilson --- src/cairo-pdf-surface.c | 9 ++++----- src/cairo-ps-surface.c | 2 +- src/cairo-surface.c | 1 - src/cairo-svg-surface.c | 2 +- src/cairoint.h | 1 - 5 files changed, 6 insertions(+), 9 deletions(-) diff --git a/src/cairo-pdf-surface.c b/src/cairo-pdf-surface.c index a10c56e82..17a07d125 100644 --- a/src/cairo-pdf-surface.c +++ b/src/cairo-pdf-surface.c @@ -2134,7 +2134,7 @@ _cairo_pdf_surface_add_padded_image_surface (cairo_pdf_surface_t *surfa _cairo_fixed_integer_floor(box.p2.y) > w || _cairo_fixed_integer_floor(box.p2.y) > h) { - pad_image = _cairo_image_surface_create_with_content (cairo_surface_get_content (&image->base), + pad_image = _cairo_image_surface_create_with_content (image->base.content, rect.width, rect.height); if (pad_image->status) { @@ -2345,7 +2345,7 @@ _cairo_pdf_surface_emit_image (cairo_pdf_surface_t *surface, cairo_surface_t *surf; cairo_surface_pattern_t pattern; - surf = _cairo_image_surface_create_with_content (cairo_surface_get_content (&image_surf->base), + surf = _cairo_image_surface_create_with_content (image_surf->base.content, image_surf->width, image_surf->height); image = (cairo_image_surface_t *) surf; @@ -2715,7 +2715,7 @@ _cairo_pdf_surface_emit_recording_surface (cairo_pdf_surface_t *surface, if (unlikely (status)) goto err; - if (cairo_surface_get_content (source) == CAIRO_CONTENT_COLOR) { + if (source->content == CAIRO_CONTENT_COLOR) { status = _cairo_pdf_surface_add_alpha (surface, 1.0, &alpha); if (unlikely (status)) goto err; @@ -6124,8 +6124,7 @@ _surface_pattern_supported (cairo_surface_pattern_t *pattern) * don't think it's worth the extra code to support it. */ /* XXX: Need to write this function here... - content = cairo_surface_get_content (pattern->surface); - if (content == CAIRO_CONTENT_ALPHA) + if (pattern->surface->content == CAIRO_CONTENT_ALPHA) return FALSE; */ diff --git a/src/cairo-ps-surface.c b/src/cairo-ps-surface.c index 6912c0249..8f8e34f53 100644 --- a/src/cairo-ps-surface.c +++ b/src/cairo-ps-surface.c @@ -2407,7 +2407,7 @@ _cairo_ps_surface_emit_image (cairo_ps_surface_t *surface, cairo_surface_t *surf; cairo_surface_pattern_t pattern; - surf = _cairo_image_surface_create_with_content (cairo_surface_get_content (&image_surf->base), + surf = _cairo_image_surface_create_with_content (image_surf->base.content, image_surf->width, image_surf->height); image = (cairo_image_surface_t *) surf; diff --git a/src/cairo-surface.c b/src/cairo-surface.c index e2080220e..715054cc7 100644 --- a/src/cairo-surface.c +++ b/src/cairo-surface.c @@ -238,7 +238,6 @@ cairo_surface_get_content (cairo_surface_t *surface) { return surface->content; } -slim_hidden_def(cairo_surface_get_content); /** * cairo_surface_status: diff --git a/src/cairo-svg-surface.c b/src/cairo-svg-surface.c index 824a27d33..f32d5224a 100644 --- a/src/cairo-svg-surface.c +++ b/src/cairo-svg-surface.c @@ -2393,7 +2393,7 @@ _cairo_svg_surface_mask (void *abstract_surface, if (mask->type == CAIRO_PATTERN_TYPE_SURFACE) { const cairo_surface_pattern_t *surface_pattern = (const cairo_surface_pattern_t*) mask; - cairo_content_t content = cairo_surface_get_content (surface_pattern->surface); + cairo_content_t content = surface_pattern->surface->content; if (content == CAIRO_CONTENT_ALPHA) discard_filter = TRUE; } diff --git a/src/cairoint.h b/src/cairoint.h index b27f8ad4b..578d6b3f1 100644 --- a/src/cairoint.h +++ b/src/cairoint.h @@ -1913,7 +1913,6 @@ slim_hidden_proto (cairo_surface_create_similar_image); slim_hidden_proto (cairo_surface_destroy); slim_hidden_proto (cairo_surface_finish); slim_hidden_proto (cairo_surface_flush); -slim_hidden_proto (cairo_surface_get_content); slim_hidden_proto (cairo_surface_get_device_offset); slim_hidden_proto (cairo_surface_get_font_options); slim_hidden_proto (cairo_surface_get_mime_data);