1.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
1.2 +++ b/gfx/cairo/pattern_get_surface-no-error.patch Wed Dec 31 06:09:35 2014 +0100
1.3 @@ -0,0 +1,29 @@
1.4 +# HG changeset patch
1.5 +# User Robert O'Callahan <robert@ocallahan.org>
1.6 +# Date 1294019288 -46800
1.7 +# Node ID e427b4ea7e2ff980769e1acd92f4730c5ed3654f
1.8 +# Parent bacc54d452a9fddb5a0d6a1442ec7be4de81ffa7
1.9 +Bug 593604. Part 2.5: cairo_pattern_get_surface should not call cairo_error. r=jrmuizel,a=blocking
1.10 +
1.11 +diff --git a/gfx/cairo/cairo/src/cairo-pattern.c b/gfx/cairo/cairo/src/cairo-pattern.c
1.12 +--- a/gfx/cairo/cairo/src/cairo-pattern.c
1.13 ++++ b/gfx/cairo/cairo/src/cairo-pattern.c
1.14 +@@ -2940,17 +2940,17 @@ cairo_pattern_get_surface (cairo_pattern
1.15 + cairo_surface_t **surface)
1.16 + {
1.17 + cairo_surface_pattern_t *spat = (cairo_surface_pattern_t*) pattern;
1.18 +
1.19 + if (pattern->status)
1.20 + return pattern->status;
1.21 +
1.22 + if (pattern->type != CAIRO_PATTERN_TYPE_SURFACE)
1.23 +- return _cairo_error (CAIRO_STATUS_PATTERN_TYPE_MISMATCH);
1.24 ++ return CAIRO_STATUS_PATTERN_TYPE_MISMATCH;
1.25 +
1.26 + if (surface)
1.27 + *surface = spat->surface;
1.28 +
1.29 + return CAIRO_STATUS_SUCCESS;
1.30 + }
1.31 +
1.32 + /**
