From d9ba8337ab456ae0e232d3c603cb41cea984ebea Mon Sep 17 00:00:00 2001 From: Bryce Harrington Date: Fri, 3 Oct 2014 11:52:32 -0700 Subject: [PATCH] quartz: Check for quartz surface type before conversion Fixes the following warning introduced in a recent commit reported by ~suv: CC cairo-quartz-image-surface.lo cairo-quartz-image-surface.c:382:37: warning: incompatible pointer types passing 'cairo_quartz_image_surface_t *' (aka 'struct cairo_quartz_image_surface *') to parameter of type 'const cairo_surface_t *' (aka 'const struct _cairo_surface *') [-Wincompatible-pointer-types] if (! _cairo_surface_is_quartz (surface)) { ^~~~~~~ ./cairo-quartz-private.h:87:50: note: passing argument to parameter 'surface' here _cairo_surface_is_quartz (const cairo_surface_t *surface); References: https://bugs.freedesktop.org/show_bug.cgi?id=84569 Signed-off-by: Bryce Harrington --- src/cairo-quartz-image-surface.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/cairo-quartz-image-surface.c b/src/cairo-quartz-image-surface.c index b4bc8b9fd..498a7b064 100644 --- a/src/cairo-quartz-image-surface.c +++ b/src/cairo-quartz-image-surface.c @@ -379,7 +379,7 @@ cairo_quartz_image_surface_get_image (cairo_surface_t *asurface) cairo_quartz_image_surface_t *surface = (cairo_quartz_image_surface_t*) asurface; /* Throw an error for a non-quartz surface */ - if (! _cairo_surface_is_quartz (surface)) { + if (! _cairo_surface_is_quartz (asurface)) { return _cairo_surface_create_in_error (_cairo_error (CAIRO_STATUS_SURFACE_TYPE_MISMATCH)); }