diff options
| author | Brian Ewins <Brian.Ewins@gmail.com> | 2007-06-18 00:07:33 +0100 |
|---|---|---|
| committer | Carl Worth <cworth@cworth.org> | 2007-11-26 21:24:50 -0800 |
| commit | ca132774c463f75b11b297c5b2b034ee669115ac (patch) | |
| tree | 46038ef4e0ca70cccf1ed6794a45f742ba400842 | |
| parent | f27164c89910430385d21fc8904cedd884f21894 (diff) | |
| download | cairo-ca132774c463f75b11b297c5b2b034ee669115ac.tar.gz | |
do not ignore errors in setup_source
In setup_source we were ignoring a return value, but we can't relay
it to the caller. This patch treats the error as an unsupported
operation.
(cherry picked from commit 07fd091e3e6b925c588b9a16f6f10efcd46615c2)
| -rw-r--r-- | src/cairo-quartz-surface.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/cairo-quartz-surface.c b/src/cairo-quartz-surface.c index b63b139f4..48e57d5e2 100644 --- a/src/cairo-quartz-surface.c +++ b/src/cairo-quartz-surface.c @@ -676,6 +676,7 @@ _cairo_quartz_setup_source (cairo_quartz_surface_t *surface, CGImageRef img = CGBitmapContextCreateImage (quartz_surf->cgContext); cairo_matrix_t m = spat->base.matrix; cairo_rectangle_int16_t extents; + cairo_status_t status; if (!img) return DO_UNSUPPORTED; @@ -685,7 +686,10 @@ _cairo_quartz_setup_source (cairo_quartz_surface_t *surface, cairo_matrix_invert(&m); _cairo_quartz_cairo_matrix_to_quartz (&m, &surface->sourceImageTransform); - _cairo_surface_get_extents (pat_surf, &extents); + status = _cairo_surface_get_extents (pat_surf, &extents); + if (status) + return DO_UNSUPPORTED; + surface->sourceImageRect = CGRectMake (0, 0, extents.width, extents.height); surface->sourceImageSurface = (cairo_surface_t *)quartz_surf; |