HCoop / jackhill / guix / guix.git / blame
| Commit | Line | Data |
|---|---|---|
| bc16eacc MW |
1 | Copied from Debian. |
| 2 | ||
| 3 | From 03a820b173ed1fdef6ff14b4468f5dbc02ff59be Mon Sep 17 00:00:00 2001 | |
| 4 | From: Heiko Lewin <heiko.lewin@worldiety.de> | |
| 5 | Date: Tue, 15 Dec 2020 16:48:19 +0100 | |
| 6 | Subject: [PATCH] Fix mask usage in image-compositor | |
| 7 | ||
| 8 | [trimmed test case, since not used in Debian build] | |
| 9 | ||
| 10 | --- | |
| 11 | src/cairo-image-compositor.c | 8 ++-- | |
| 12 | ||
| 13 | --- cairo-1.16.0.orig/src/cairo-image-compositor.c | |
| 14 | +++ cairo-1.16.0/src/cairo-image-compositor.c | |
| 15 | @@ -2601,14 +2601,14 @@ _inplace_src_spans (void *abstract_rende | |
| 16 | unsigned num_spans) | |
| 17 | { | |
| 18 | cairo_image_span_renderer_t *r = abstract_renderer; | |
| 19 | - uint8_t *m; | |
| 20 | + uint8_t *m, *base = (uint8_t*)pixman_image_get_data(r->mask); | |
| 21 | int x0; | |
| 22 | ||
| 23 | if (num_spans == 0) | |
| 24 | return CAIRO_STATUS_SUCCESS; | |
| 25 | ||
| 26 | x0 = spans[0].x; | |
| 27 | - m = r->_buf; | |
| 28 | + m = base; | |
| 29 | do { | |
| 30 | int len = spans[1].x - spans[0].x; | |
| 31 | if (len >= r->u.composite.run_length && spans[0].coverage == 0xff) { | |
| 32 | @@ -2646,7 +2646,7 @@ _inplace_src_spans (void *abstract_rende | |
| 33 | spans[0].x, y, | |
| 34 | spans[1].x - spans[0].x, h); | |
| 35 | ||
| 36 | - m = r->_buf; | |
| 37 | + m = base; | |
| 38 | x0 = spans[1].x; | |
| 39 | } else if (spans[0].coverage == 0x0) { | |
| 40 | if (spans[0].x != x0) { | |
| 41 | @@ -2675,7 +2675,7 @@ _inplace_src_spans (void *abstract_rende | |
| 42 | #endif | |
| 43 | } | |
| 44 | ||
| 45 | - m = r->_buf; | |
| 46 | + m = base; | |
| 47 | x0 = spans[1].x; | |
| 48 | } else { | |
| 49 | *m++ = spans[0].coverage; |