| 1234567891011121314151617181920212223242526272829303132333435363738394041424344454647484950515253545556 |
- 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
|
