fdo-mirrors/cairo
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/cairo/cairo.git synced 2026-05-04 18:48:09 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Erradicate internal use of cairo_surface_get_type()

Browse source 
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
This commit is contained in:
Chris Wilson 2012-06-01 17:46:25 +01:00
parent e23d179e08
commit f1b546b1a2
5 changed files with 6 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/cairo-pdf-surface.c
View file

@ -52,7 +52,7 @@
#include "cairo-composite-rectangles-private.h"
#include "cairo-default-context-private.h"
#include "cairo-error-private.h"
#include "cairo-image-surface-private.h"
#include "cairo-image-surface-inline.h"
#include "cairo-image-info-private.h"
#include "cairo-recording-surface-private.h"
#include "cairo-output-stream-private.h"
@ -1130,7 +1130,7 @@ _cairo_pdf_surface_acquire_source_image_from_pattern (cairo_pdf_surface_t
surf = _cairo_raster_source_pattern_acquire (pattern, &surface->base, NULL);
if (!surf)
return CAIRO_INT_STATUS_UNSUPPORTED;
assert (cairo_surface_get_type (surf) == CAIRO_SURFACE_TYPE_IMAGE);
assert (_cairo_surface_is_image (surf));
*image = (cairo_image_surface_t *) surf;
} break;

4
src/cairo-ps-surface.c
View file

@ -66,7 +66,7 @@
#include "cairo-composite-rectangles-private.h"
#include "cairo-default-context-private.h"
#include "cairo-error-private.h"
#include "cairo-image-surface-private.h"
#include "cairo-image-surface-inline.h"
#include "cairo-list-inline.h"
#include "cairo-scaled-font-subsets-private.h"
#include "cairo-paginated-private.h"
@ -1738,7 +1738,7 @@ _cairo_ps_surface_acquire_source_surface_from_pattern (cairo_ps_surface_t
surf = _cairo_raster_source_pattern_acquire (pattern, &surface->base, &rect);
if (!surf)
return CAIRO_INT_STATUS_UNSUPPORTED;
assert (cairo_surface_get_type (surf) == CAIRO_SURFACE_TYPE_IMAGE);
assert (_cairo_surface_is_image (surf));
image = (cairo_image_surface_t *) surf;
} break;

4
src/cairo-quartz-image-surface.c
View file

@ -309,7 +309,7 @@ cairo_quartz_image_surface_create (cairo_surface_t *surface)
if (surface->status)
return surface;
if (cairo_surface_get_type(surface) != CAIRO_SURFACE_TYPE_IMAGE)
if (! _cairo_surface_is_image (surface))
return SURFACE_ERROR_TYPE_MISMATCH;
image_surface = (cairo_image_surface_t*) surface;
@ -374,7 +374,7 @@ cairo_quartz_image_surface_get_image (cairo_surface_t *asurface)
{
cairo_quartz_image_surface_t *surface = (cairo_quartz_image_surface_t*) asurface;
if (cairo_surface_get_type(asurface) != CAIRO_SURFACE_TYPE_QUARTZ_IMAGE)
if (asurface->type != CAIRO_SURFACE_TYPE_QUARTZ_IMAGE)
return NULL;
return (cairo_surface_t*) surface->imageSurface;

1
src/cairo-surface.c
View file

@ -219,7 +219,6 @@ cairo_surface_get_type (cairo_surface_t *surface)
* surface. */
return surface->type;
}
slim_hidden_def (cairo_surface_get_type);
/**
* cairo_surface_get_content:

1
src/cairoint.h
View file

@ -1916,7 +1916,6 @@ slim_hidden_proto (cairo_surface_flush);
slim_hidden_proto (cairo_surface_get_device_offset);
slim_hidden_proto (cairo_surface_get_font_options);
slim_hidden_proto (cairo_surface_get_mime_data);
slim_hidden_proto (cairo_surface_get_type);
slim_hidden_proto (cairo_surface_has_show_text_glyphs);
slim_hidden_proto (cairo_surface_mark_dirty);
slim_hidden_proto (cairo_surface_mark_dirty_rectangle);