diff options
author | wolfbeast <mcwerewolf@wolfbeast.com> | 2019-11-06 21:06:15 +0100 |
---|---|---|
committer | wolfbeast <mcwerewolf@wolfbeast.com> | 2019-11-07 14:49:48 +0100 |
commit | 7efd71616ec5efedbe626a986a707c35d3cac323 (patch) | |
tree | 0223e8271d9d18763efd743f43f98b8b8b9e5c2e /gfx/cairo/cairo-region-clip.patch | |
parent | bbc2206a0fda053a6f5071b457bd209dab9ed268 (diff) | |
download | UXP-7efd71616ec5efedbe626a986a707c35d3cac323.tar UXP-7efd71616ec5efedbe626a986a707c35d3cac323.tar.gz UXP-7efd71616ec5efedbe626a986a707c35d3cac323.tar.lz UXP-7efd71616ec5efedbe626a986a707c35d3cac323.tar.xz UXP-7efd71616ec5efedbe626a986a707c35d3cac323.zip |
Issue #1274 - Part 1: Adopt the cairo version as our own.
- Move header licensing from tri-license to MPL 2.0. MPL-compatible
other licensing has been retained where originally present.
- Remove individual superseded licensing terms.
- Remove patches, outdated readmes & incomplete patch summaries.
- Remove incomplete cairo release notes (only went up to 1.6.4 anyway).
- Rewrite COPYING to indicate the current state of the library in tree.
Diffstat (limited to 'gfx/cairo/cairo-region-clip.patch')
-rw-r--r-- | gfx/cairo/cairo-region-clip.patch | 34 |
1 files changed, 0 insertions, 34 deletions
diff --git a/gfx/cairo/cairo-region-clip.patch b/gfx/cairo/cairo-region-clip.patch deleted file mode 100644 index a0eb2d265..000000000 --- a/gfx/cairo/cairo-region-clip.patch +++ /dev/null @@ -1,34 +0,0 @@ -# HG changeset patch -# User Matt Woodrow <mwoodrow@mozilla.com> -# Date 1408674084 -43200 -# Fri Aug 22 14:21:24 2014 +1200 -# Node ID 2b819b882c3b26c02d821e8d713591a9b56f1728 -# Parent ffd1fc7e7d5a85e4823b5f2067b4a24d358a0e41 -Bug 1050788 - Fix cairo clip path region construction when the first path generates no traps. r=jrmuizel - -diff --git a/gfx/cairo/cairo/src/cairo-clip.c b/gfx/cairo/cairo/src/cairo-clip.c ---- a/gfx/cairo/cairo/src/cairo-clip.c -+++ b/gfx/cairo/cairo/src/cairo-clip.c -@@ -590,16 +590,22 @@ static cairo_int_status_t - status = _cairo_path_fixed_fill_rectilinear_to_traps (&clip_path->path, - clip_path->fill_rule, - &traps); - if (unlikely (_cairo_status_is_error (status))) - return status; - if (status == CAIRO_INT_STATUS_UNSUPPORTED) - goto UNSUPPORTED; - -+ if (unlikely (traps.num_traps == 0)) { -+ clip_path->region = cairo_region_create (); -+ clip_path->flags |= CAIRO_CLIP_PATH_HAS_REGION; -+ return CAIRO_STATUS_SUCCESS; -+ } -+ - if (traps.num_traps > ARRAY_LENGTH (stack_boxes)) { - boxes = _cairo_malloc_ab (traps.num_traps, sizeof (cairo_box_t)); - if (unlikely (boxes == NULL)) - return _cairo_error (CAIRO_STATUS_NO_MEMORY); - } - - for (n = 0; n < traps.num_traps; n++) { - boxes[n].p1.x = traps.traps[n].left.p1.x; |