external/cairo/cairo/cairo.RGB24_888.patch | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
New commits:
commit ae3965f6cc87a7d57da319370ef1d783682100a8
Author: Stephan Bergmann <sberg...@redhat.com>
AuthorDate: Thu Sep 1 15:54:14 2022 +0200
Commit: Stephan Bergmann <sberg...@redhat.com>
CommitDate: Fri Sep 2 08:37:40 2022 +0200
external/cairo: Remove dead code from cairo.RGB24_888.patch
...now that ab157ab93e0c5a62927947a8d2b0c1c277e526ac "move part of sanitizer
patch to the patch that introduced the problem" unilaterally folded in here
the
content of f5e1314ffa564077c27fb9c954c792b498bcae12 "external/cairo: Fix
previous -fsanitize=alignment fix", about which that commit's message had
stated: "The following line
> pixel &= 0x00ffffff; /* ignore next pixel bits */
should no longer be necessary now, and it is probably better to directly
fix the
original code in external/cairo/cairo/cairo-1.10.2.patch, but I'll leave
that
for a potential follow-up fix, once the provenance and assumed quality of
that
original CAIRO_FORMAT_RGB24_888 code is clarified." (The provenance and
quality
of that code is still not clarified though, see the still unanswered
question in
the comment at
<https://gerrit.libreoffice.org/c/core/+/116637/2#message-407ec72875fcb015a3024f9a7ebf8480513b1e5e>
"external/cairo: Fix previous -fsanitize=alignment fix".)
Change-Id: Ic729bff238a35fac69d048b7c3912dd706a5b601
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139211
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sberg...@redhat.com>
diff --git a/external/cairo/cairo/cairo.RGB24_888.patch
b/external/cairo/cairo/cairo.RGB24_888.patch
index d4f31c5cb81d..b33bee411b9b 100644
--- a/external/cairo/cairo/cairo.RGB24_888.patch
+++ b/external/cairo/cairo/cairo.RGB24_888.patch
@@ -31,13 +31,12 @@ 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,20 @@
+@@ -509,6 +509,19 @@
color.blue = expand_channel(pixel & 0x3fff, 10);
return pixman_image_create_solid_fill (&color);
+ case CAIRO_FORMAT_RGB24_888:
+ pixel = (uint32_t)(image->data + y * image->stride + 3 * x)[0] |
((uint32_t)(image->data + y * image->stride + 3 * x)[1] << 8) |
((uint32_t)(image->data + y * image->stride + 3 * x)[2] << 16);
-+ pixel &= 0x00ffffff; /* ignore next pixel bits */
+ if (pixel == 0)
+ return _pixman_black_image ();
+ if (pixel == 0x00ffffff)
