summaryrefslogtreecommitdiffstats
path: root/gfx/cairo/copyarea-with-alpha.patch
diff options
context:
space:
mode:
authorwolfbeast <mcwerewolf@wolfbeast.com>2019-11-06 21:06:15 +0100
committerwolfbeast <mcwerewolf@wolfbeast.com>2019-11-07 14:49:48 +0100
commit7efd71616ec5efedbe626a986a707c35d3cac323 (patch)
tree0223e8271d9d18763efd743f43f98b8b8b9e5c2e /gfx/cairo/copyarea-with-alpha.patch
parentbbc2206a0fda053a6f5071b457bd209dab9ed268 (diff)
downloadUXP-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/copyarea-with-alpha.patch')
-rw-r--r--gfx/cairo/copyarea-with-alpha.patch110
1 files changed, 0 insertions, 110 deletions
diff --git a/gfx/cairo/copyarea-with-alpha.patch b/gfx/cairo/copyarea-with-alpha.patch
deleted file mode 100644
index c6765105e..000000000
--- a/gfx/cairo/copyarea-with-alpha.patch
+++ /dev/null
@@ -1,110 +0,0 @@
-diff --git a/gfx/cairo/cairo/src/cairo-xlib-surface.c b/gfx/cairo/cairo/src/cairo-xlib-surface.c
---- a/gfx/cairo/cairo/src/cairo-xlib-surface.c
-+++ b/gfx/cairo/cairo/src/cairo-xlib-surface.c
-@@ -1722,30 +1722,31 @@ _surface_has_alpha (cairo_xlib_surface_t
- else
- return FALSE;
- } else {
- /* In the no-render case, we never have alpha */
- return FALSE;
- }
- }
-
--/* Returns true if the given operator and source-alpha combination
-- * requires alpha compositing to complete.
-+/* Returns true if the given operator and alpha combination requires alpha
-+ * compositing to complete on source and destination surfaces with the same
-+ * format. i.e. if a simple bitwise copy is not appropriate.
- */
- static cairo_bool_t
- _operator_needs_alpha_composite (cairo_operator_t op,
-- cairo_bool_t destination_has_alpha,
-- cairo_bool_t source_has_alpha)
-+ cairo_bool_t surfaces_have_alpha)
- {
-- if (op == CAIRO_OPERATOR_SOURCE ||
-- (! source_has_alpha &&
-- (op == CAIRO_OPERATOR_OVER ||
-- op == CAIRO_OPERATOR_ATOP ||
-- op == CAIRO_OPERATOR_IN)))
-- return destination_has_alpha;
-+ if (op == CAIRO_OPERATOR_SOURCE)
-+ return FALSE;
-+
-+ if (op == CAIRO_OPERATOR_OVER ||
-+ op == CAIRO_OPERATOR_IN ||
-+ op == CAIRO_OPERATOR_ATOP)
-+ return surfaces_have_alpha;
-
- return TRUE;
- }
-
- /* There is a bug in most older X servers with compositing using a
- * untransformed repeating source pattern when the source is in off-screen
- * video memory, and another with repeated transformed images using a
- * general transform matrix. When these bugs could be triggered, we need a
-@@ -1843,24 +1844,24 @@ _categorize_composite_operation (cairo_x
- */
- static composite_operation_t
- _recategorize_composite_operation (cairo_xlib_surface_t *dst,
- cairo_operator_t op,
- cairo_xlib_surface_t *src,
- cairo_surface_attributes_t *src_attr,
- cairo_bool_t have_mask)
- {
-- /* Can we use the core protocol? */
-+ /* Can we use the core protocol? (If _surfaces_compatible, then src and
-+ * dst have the same format and _surface_has_alpha is the same for each.)
-+ */
- if (! have_mask &&
- src->owns_pixmap &&
-- src->depth == dst->depth &&
-+ _surfaces_compatible (src, dst) &&
- _cairo_matrix_is_integer_translation (&src_attr->matrix, NULL, NULL) &&
-- ! _operator_needs_alpha_composite (op,
-- _surface_has_alpha (dst),
-- _surface_has_alpha (src)))
-+ ! _operator_needs_alpha_composite (op, _surface_has_alpha (dst)))
- {
- if (src_attr->extend == CAIRO_EXTEND_NONE)
- return DO_XCOPYAREA;
-
- if (dst->buggy_repeat && src_attr->extend == CAIRO_EXTEND_REPEAT)
- return DO_XTILE;
- }
-
-@@ -2211,34 +2212,28 @@ _cairo_xlib_surface_composite (cairo_ope
- cairo_surface_attributes_t src_attr, mask_attr;
- cairo_xlib_surface_t *dst = abstract_dst;
- cairo_xlib_surface_t *src;
- cairo_xlib_surface_t *mask;
- cairo_int_status_t status;
- composite_operation_t operation;
- int itx, ity;
- cairo_bool_t is_integer_translation;
-- cairo_bool_t needs_alpha_composite;
- GC gc;
-
- if (mask_pattern != NULL && ! CAIRO_SURFACE_RENDER_HAS_COMPOSITE (dst))
- return UNSUPPORTED ("no support for masks");
-
- operation = _categorize_composite_operation (dst, op, src_pattern,
- mask_pattern != NULL);
- if (operation == DO_UNSUPPORTED)
- return UNSUPPORTED ("unsupported operation");
-
- X_DEBUG ((dst->dpy, "composite (dst=%x)", (unsigned int) dst->drawable));
-
-- needs_alpha_composite =
-- _operator_needs_alpha_composite (op,
-- _surface_has_alpha (dst),
-- ! _cairo_pattern_is_opaque (src_pattern));
--
- _cairo_xlib_display_notify (dst->display);
-
- status =
- _cairo_xlib_surface_acquire_pattern_surfaces (dst,
- src_pattern, mask_pattern,
- src_x, src_y,
- mask_x, mask_y,
- width, height,