diff options
| author | Michael Vrhel <michael.vrhel@artifex.com> | 2019-10-28 10:37:46 -0700 |
|---|---|---|
| committer | Michael Vrhel <michael.vrhel@artifex.com> | 2019-10-28 14:37:34 -0700 |
| commit | 7870f4951bcc6a153f317e3439e14d0e929fd231 (patch) | |
| tree | 68ee803b796635a5a7f7c845574bf82dad3e912f | |
| parent | 1e6b2518ed4b130ad649b96bf914558e642e414d (diff) | |
Bug 701795: Segv due to image mask issue
| -rw-r--r-- | base/gxblend.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/base/gxblend.c b/base/gxblend.c index 59d0deaf3..c07b2fbd7 100644 --- a/base/gxblend.c +++ b/base/gxblend.c | |||
| @@ -3476,7 +3476,7 @@ do_compose_group(pdf14_buf *tos, pdf14_buf *nos, pdf14_buf *maskbuf, | |||
| 3476 | overprint == 0) { | 3476 | overprint == 0) { |
| 3477 | /* Additive vs Subtractive makes no difference in normal blend mode with no spots */ | 3477 | /* Additive vs Subtractive makes no difference in normal blend mode with no spots */ |
| 3478 | if (tos_isolated) { | 3478 | if (tos_isolated) { |
| 3479 | if (has_mask || maskbuf) {/* 7% */ | 3479 | if (has_mask && maskbuf) {/* 7% */ |
| 3480 | /* AirPrint test case hits this */ | 3480 | /* AirPrint test case hits this */ |
| 3481 | if (maskbuf && maskbuf->rect.p.x <= x0 && maskbuf->rect.p.y <= y0 && | 3481 | if (maskbuf && maskbuf->rect.p.x <= x0 && maskbuf->rect.p.y <= y0 && |
| 3482 | maskbuf->rect.q.x >= x1 && maskbuf->rect.q.y >= y1) { | 3482 | maskbuf->rect.q.x >= x1 && maskbuf->rect.q.y >= y1) { |
| @@ -4246,7 +4246,7 @@ do_compose_group16(pdf14_buf *tos, pdf14_buf *nos, pdf14_buf *maskbuf, | |||
| 4246 | overprint == 0) { | 4246 | overprint == 0) { |
| 4247 | /* Additive vs Subtractive makes no difference in normal blend mode with no spots */ | 4247 | /* Additive vs Subtractive makes no difference in normal blend mode with no spots */ |
| 4248 | if (tos_isolated) { | 4248 | if (tos_isolated) { |
| 4249 | if (has_mask || maskbuf) {/* 7% */ | 4249 | if (has_mask && maskbuf) {/* 7% */ |
| 4250 | /* AirPrint test case hits this */ | 4250 | /* AirPrint test case hits this */ |
| 4251 | if (maskbuf && maskbuf->rect.p.x <= x0 && maskbuf->rect.p.y <= y0 && | 4251 | if (maskbuf && maskbuf->rect.p.x <= x0 && maskbuf->rect.p.y <= y0 && |
| 4252 | maskbuf->rect.q.x >= x1 && maskbuf->rect.q.y >= y1) | 4252 | maskbuf->rect.q.x >= x1 && maskbuf->rect.q.y >= y1) |