external/cairo/cairo/cairo.RGB24_888.patch | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit 2701a38cffd64853f881b3a4f81c49d64ee1549b
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Mon Mar 7 10:24:14 2022 +0000
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Mon Mar 7 15:00:31 2022 +0100
ofz: Use-of-uninitialized value
Change-Id: I67063e20f5fc3c3418ee3db5c7a1f3e4a4a7121c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131100
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caol...@redhat.com>
diff --git a/external/cairo/cairo/cairo.RGB24_888.patch
b/external/cairo/cairo/cairo.RGB24_888.patch
index f0cc9bb0beb0..6b2befabcc6c 100644
--- a/external/cairo/cairo/cairo.RGB24_888.patch
+++ b/external/cairo/cairo/cairo.RGB24_888.patch
@@ -31,7 +31,7 @@ diff -ru cairo-1.17.4.orig/src/cairo.h
cairo-1.17.4/src/cairo.h
diff -ru cairo-1.17.4.orig/src/cairo-image-source.c
cairo-1.17.4/src/cairo-image-source.c
--- misc/cairo-1.17.4.orig/src/cairo-image-source.c 2021-08-29
19:43:26.979435585 +0100
+++ misc/build/cairo-1.17.4/src/cairo-image-source.c 2021-08-29
19:43:47.501506559 +0100
-@@ -509,6 +509,19 @@
+@@ -509,6 +509,20 @@
color.blue = expand_channel(pixel & 0x3fff, 10);
return pixman_image_create_solid_fill (&color);
@@ -43,6 +43,7 @@ diff -ru cairo-1.17.4.orig/src/cairo-image-source.c
cairo-1.17.4/src/cairo-image
+ if (pixel == 0x00ffffff)
+ return _pixman_white_image ();
+
++ color.alpha = 0xffff;
+ color.red = (pixel >> 16 & 0xff) | (pixel >> 8 & 0xff00);
+ color.green = (pixel >> 8 & 0xff) | (pixel & 0xff00);
+ color.blue = (pixel & 0xff) | (pixel << 8 & 0xff00);
