b392d656c7
News: - https://www.cairographics.org/news/cairo-1.17.2/ - https://www.cairographics.org/news/cairo-1.17.4/ !! This is a bump to a snapshot release: 1.17.4. But it is the first version that supports meson, and the only version that supports both meson and autotools. This is just an intermediate bump in order to switch over to meson in a later commit. Patches: - drop 0001-fix-nofork-build.patch, upstream: [1] - drop 0002-ft-Use-FT_Done_MM_Var-instead-of-free-when-available-in-cairo_ft_apply_variation.patch, upstream: [2] - add 0003-cairo-ft-private.h-fix-missing-FT_Color-error.patch, upstream: [3] [1]:cb2357f481[2]:90e85c2493[3]: https://gitlab.freedesktop.org/cairo/cairo/-/issues/792 Signed-off-by: Thomas Devoogdt <thomas@devoogdt.com> Reviewed-by: Adrian Perez de Castro <aperez@igalia.com> Tested-by: Adrian Perez de Castro <aperez@igalia.com> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
57 lines
1.7 KiB
Diff
57 lines
1.7 KiB
Diff
From 03a820b173ed1fdef6ff14b4468f5dbc02ff59be Mon Sep 17 00:00:00 2001
|
|
From: Heiko Lewin <heiko.lewin@worldiety.de>
|
|
Date: Tue, 15 Dec 2020 16:48:19 +0100
|
|
Subject: [PATCH] Fix mask usage in image-compositor
|
|
|
|
[Retrieved from
|
|
https://gitlab.freedesktop.org/cairo/cairo/-/commit/03a820b173ed1fdef6ff14b4468f5dbc02ff59be]
|
|
[Removed changes in test/ directory to remove binary diff so that the
|
|
patch can be applied by `patch` tool]
|
|
Signed-off-by: Quentin Schulz <quentin.schulz@theobroma-systems.com>
|
|
---
|
|
src/cairo-image-compositor.c | 8 ++++----
|
|
1 file changed, 4 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/src/cairo-image-compositor.c b/src/cairo-image-compositor.c
|
|
index bbf4cf228..2352c478e 100644
|
|
--- a/src/cairo-image-compositor.c
|
|
+++ b/src/cairo-image-compositor.c
|
|
@@ -2601,14 +2601,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) {
|
|
@@ -2646,7 +2646,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) {
|
|
@@ -2675,7 +2675,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;
|
|
--
|
|
2.38.1
|
|
|