[Libreoffice-commits] core.git: Branch 'libreoffice-7-1' - external/cairo

[Stephan Bergmann (via logerrit)]

 external/cairo/UnpackedTarball_cairo.mk                              |    1 
 external/cairo/cairo/0001-Fix-mask-usage-in-image-compositor.patch.1 |   54 ++++++++++
 2 files changed, 55 insertions(+)

New commits:
commit 76cde069bcbb16c043e0a40925fd271d234eac53
Author:     Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Tue Dec 29 10:56:48 2020 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Wed Dec 30 22:26:36 2020 +0100

    external/cairo: Fix mask usage in image-compositor
    
    Change-Id: Id3d8e4715e295290e07146ef06898b313ead57a5
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/108449
    Tested-by: Jenkins
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>
    (cherry picked from commit c767e91c725b504db08e84b1fd25b11bfc33a4cc)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/108344
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/external/cairo/UnpackedTarball_cairo.mk b/external/cairo/UnpackedTarball_cairo.mk
index dfd79d673be1..920722c2e77a 100644
--- a/external/cairo/UnpackedTarball_cairo.mk
+++ b/external/cairo/UnpackedTarball_cairo.mk
@@ -16,6 +16,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,cairo,\
 	external/cairo/cairo/cairo-libtool-rpath.patch.1 \
 	external/cairo/cairo/cairo.oldfreetype.patch \
 	external/cairo/cairo/san.patch.0 \
+	external/cairo/cairo/0001-Fix-mask-usage-in-image-compositor.patch.1 \
 ))
 
 ifeq ($(OS),iOS)
diff --git a/external/cairo/cairo/0001-Fix-mask-usage-in-image-compositor.patch.1 b/external/cairo/cairo/0001-Fix-mask-usage-in-image-compositor.patch.1
new file mode 100644
index 000000000000..c0431555b09a
--- /dev/null
+++ b/external/cairo/cairo/0001-Fix-mask-usage-in-image-compositor.patch.1
@@ -0,0 +1,54 @@
+From 03a820b173ed1fdef6ff14b4468f5dbc02ff59be Mon Sep 17 00:00:00 2001
+From: Heiko Lewin <heiko.lewin at worldiety.de>
+Date: Tue, 15 Dec 2020 16:48:19 +0100
+Subject: [PATCH] Fix mask usage in image-compositor
+
+---
+ src/cairo-image-compositor.c                |   8 ++--
+ test/Makefile.sources                       |   1 +
+ test/bug-image-compositor.c                 |  39 ++++++++++++++++++++
+ test/reference/bug-image-compositor.ref.png | Bin 0 -> 185 bytes
+ 4 files changed, 44 insertions(+), 4 deletions(-)
+ create mode 100644 test/bug-image-compositor.c
+ create mode 100644 test/reference/bug-image-compositor.ref.png
+
+diff --git a/src/cairo-image-compositor.c b/src/cairo-image-compositor.c
+index 79ad69f68..4f8aaed99 100644
+--- a/src/cairo-image-compositor.c
++++ b/src/cairo-image-compositor.c
+@@ -2610,14 +2610,14 @@ _inplace_src_spans (void *abstract_renderer, int y, int h,
+ 		    unsigned num_spans)
+ {
+     cairo_image_span_renderer_t *r = abstract_renderer;
+-    uint8_t *m;
++    uint8_t *m, *base = (uint8_t*)pixman_image_get_data(r->mask);
+     int x0;
+ 
+     if (num_spans == 0)
+ 	return CAIRO_STATUS_SUCCESS;
+ 
+     x0 = spans[0].x;
+-    m = r->_buf;
++    m = base;
+     do {
+ 	int len = spans[1].x - spans[0].x;
+ 	if (len >= r->u.composite.run_length && spans[0].coverage == 0xff) {
+@@ -2655,7 +2655,7 @@ _inplace_src_spans (void *abstract_renderer, int y, int h,
+ 				      spans[0].x, y,
+ 				      spans[1].x - spans[0].x, h);
+ 
+-	    m = r->_buf;
++	    m = base;
+ 	    x0 = spans[1].x;
+ 	} else if (spans[0].coverage == 0x0) {
+ 	    if (spans[0].x != x0) {
+@@ -2684,7 +2684,7 @@ _inplace_src_spans (void *abstract_renderer, int y, int h,
+ #endif
+ 	    }
+ 
+-	    m = r->_buf;
++	    m = base;
+ 	    x0 = spans[1].x;
+ 	} else {
+ 	    *m++ = spans[0].coverage;
+[test code changes removed]