diff options
| author | Matt A. Tobin <mattatobin@localhost.localdomain> | 2018-02-02 04:16:08 -0500 |
|---|---|---|
| committer | Matt A. Tobin <mattatobin@localhost.localdomain> | 2018-02-02 04:16:08 -0500 |
| commit | 5f8de423f190bbb79a62f804151bc24824fa32d8 (patch) | |
| tree | 10027f336435511475e392454359edea8e25895d /gfx/cairo/pattern_get_surface-no-error.patch | |
| parent | 49ee0794b5d912db1f95dce6eb52d781dc210db5 (diff) | |
| download | UXP-5f8de423f190bbb79a62f804151bc24824fa32d8.tar UXP-5f8de423f190bbb79a62f804151bc24824fa32d8.tar.gz UXP-5f8de423f190bbb79a62f804151bc24824fa32d8.tar.lz UXP-5f8de423f190bbb79a62f804151bc24824fa32d8.tar.xz UXP-5f8de423f190bbb79a62f804151bc24824fa32d8.zip | |
Add m-esr52 at 52.6.0
Diffstat (limited to 'gfx/cairo/pattern_get_surface-no-error.patch')
| -rw-r--r-- | gfx/cairo/pattern_get_surface-no-error.patch | 29 |
1 files changed, 29 insertions, 0 deletions
diff --git a/gfx/cairo/pattern_get_surface-no-error.patch b/gfx/cairo/pattern_get_surface-no-error.patch new file mode 100644 index 000000000..93f08512d --- /dev/null +++ b/gfx/cairo/pattern_get_surface-no-error.patch @@ -0,0 +1,29 @@ +# HG changeset patch +# User Robert O'Callahan <robert@ocallahan.org> +# Date 1294019288 -46800 +# Node ID e427b4ea7e2ff980769e1acd92f4730c5ed3654f +# Parent bacc54d452a9fddb5a0d6a1442ec7be4de81ffa7 +Bug 593604. Part 2.5: cairo_pattern_get_surface should not call cairo_error. r=jrmuizel,a=blocking + +diff --git a/gfx/cairo/cairo/src/cairo-pattern.c b/gfx/cairo/cairo/src/cairo-pattern.c +--- a/gfx/cairo/cairo/src/cairo-pattern.c ++++ b/gfx/cairo/cairo/src/cairo-pattern.c +@@ -2940,17 +2940,17 @@ cairo_pattern_get_surface (cairo_pattern + cairo_surface_t **surface) + { + cairo_surface_pattern_t *spat = (cairo_surface_pattern_t*) pattern; + + if (pattern->status) + return pattern->status; + + if (pattern->type != CAIRO_PATTERN_TYPE_SURFACE) +- return _cairo_error (CAIRO_STATUS_PATTERN_TYPE_MISMATCH); ++ return CAIRO_STATUS_PATTERN_TYPE_MISMATCH; + + if (surface) + *surface = spat->surface; + + return CAIRO_STATUS_SUCCESS; + } + + /** |