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/bgr.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/bgr.patch')
-rw-r--r-- | gfx/cairo/bgr.patch | 104 |
1 files changed, 0 insertions, 104 deletions
diff --git a/gfx/cairo/bgr.patch b/gfx/cairo/bgr.patch deleted file mode 100644 index af72fa237..000000000 --- a/gfx/cairo/bgr.patch +++ /dev/null @@ -1,104 +0,0 @@ -commit d2120bdb06c9aacc470bb346d6bc2071c2e0749d -Author: Jeff Muizelaar <jmuizelaar@mozilla.com> -Date: Fri Mar 12 15:32:09 2010 -0500 - - BGR - -diff --git a/src/cairo-surface.c b/src/cairo-surface.c -index 332e3ab..4a1d6a0 100644 ---- a/src/cairo-surface.c -+++ b/src/cairo-surface.c -@@ -1501,7 +1501,9 @@ static void - _wrap_release_source_image (void *data) - { - struct acquire_source_image_data *acquire_data = data; -- _cairo_surface_release_source_image (acquire_data->src, acquire_data->image, acquire_data->image_extra); -+ _cairo_surface_release_source_image (acquire_data->src, -+ acquire_data->image, -+ acquire_data->image_extra); - free(data); - } - -@@ -1515,42 +1517,47 @@ _wrap_image (cairo_surface_t *src, - cairo_image_surface_t *surface; - cairo_status_t status; - -- struct acquire_source_image_data *data = malloc(sizeof(*data)); -+ struct acquire_source_image_data *data = malloc (sizeof (*data)); -+ if (unlikely (data == NULL)) -+ return _cairo_error (CAIRO_STATUS_NO_MEMORY); - data->src = src; - data->image = image; - data->image_extra = image_extra; - -- surface = (cairo_image_surface_t*)cairo_image_surface_create_for_data (image->data, -- image->format, -- image->width, -- image->height, -- image->stride); -+ surface = (cairo_image_surface_t*) -+ _cairo_image_surface_create_with_pixman_format (image->data, -+ image->pixman_format, -+ image->width, -+ image->height, -+ image->stride); - status = surface->base.status; -- if (status) -+ if (status) { -+ free (data); - return status; -+ } - - status = _cairo_user_data_array_set_data (&surface->base.user_data, -- &wrap_image_key, -- data, -- _wrap_release_source_image); -+ &wrap_image_key, -+ data, -+ _wrap_release_source_image); - if (status) { - cairo_surface_destroy (&surface->base); -+ free (data); - return status; - } --/* -- pixman_image_set_component_alpha (surface->pixman_image, -- pixman_image_get_component_alpha (image->pixman_image)); --*/ -+ -+ pixman_image_set_component_alpha ( -+ surface->pixman_image, -+ pixman_image_get_component_alpha (image->pixman_image)); -+ - *out = surface; - return CAIRO_STATUS_SUCCESS; - } - -- - /** - * _cairo_surface_clone_similar: - * @surface: a #cairo_surface_t - * @src: the source image -- * @content: target content mask - * @src_x: extent for the rectangle in src we actually care about - * @src_y: extent for the rectangle in src we actually care about - * @width: extent for the rectangle in src we actually care about -@@ -1627,12 +1634,12 @@ _cairo_surface_clone_similar (cairo_surface_t *surface, - _cairo_surface_release_source_image (src, image, image_extra); - } else { - status = -- surface->backend->clone_similar (surface, &image->base, -- src_x, src_y, -- width, height, -- clone_offset_x, -- clone_offset_y, -- clone_out); -+ surface->backend->clone_similar (surface, &image->base, -+ src_x, src_y, -+ width, height, -+ clone_offset_x, -+ clone_offset_y, -+ clone_out); - cairo_surface_destroy(&image->base); - } - } |