1# HG changeset patch 2# User Robert O'Callahan <robert@ocallahan.org> 3# Date 1294019288 -46800 4# Node ID e427b4ea7e2ff980769e1acd92f4730c5ed3654f 5# Parent bacc54d452a9fddb5a0d6a1442ec7be4de81ffa7 6Bug 593604. Part 2.5: cairo_pattern_get_surface should not call cairo_error. r=jrmuizel,a=blocking 7 8diff --git a/gfx/cairo/cairo/src/cairo-pattern.c b/gfx/cairo/cairo/src/cairo-pattern.c 9--- a/gfx/cairo/cairo/src/cairo-pattern.c 10+++ b/gfx/cairo/cairo/src/cairo-pattern.c 11@@ -2940,17 +2940,17 @@ cairo_pattern_get_surface (cairo_pattern 12 cairo_surface_t **surface) 13 { 14 cairo_surface_pattern_t *spat = (cairo_surface_pattern_t*) pattern; 15 16 if (pattern->status) 17 return pattern->status; 18 19 if (pattern->type != CAIRO_PATTERN_TYPE_SURFACE) 20- return _cairo_error (CAIRO_STATUS_PATTERN_TYPE_MISMATCH); 21+ return CAIRO_STATUS_PATTERN_TYPE_MISMATCH; 22 23 if (surface) 24 *surface = spat->surface; 25 26 return CAIRO_STATUS_SUCCESS; 27 } 28 29 /** 30