diff options
Diffstat (limited to 'devices/vector/gdevpdft.c')
| -rw-r--r-- | devices/vector/gdevpdft.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/devices/vector/gdevpdft.c b/devices/vector/gdevpdft.c index 46f4d312..a963cb51 100644 --- a/devices/vector/gdevpdft.c +++ b/devices/vector/gdevpdft.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2019 Artifex Software, Inc. +/* Copyright (C) 2001-2020 Artifex Software, Inc. All Rights Reserved. This software is provided AS-IS with no warranty, either express or @@ -107,7 +107,7 @@ pdf_make_group_dict(gx_device_pdf * pdev, const gs_pdf14trans_params_t * pparams a group color specified. In this case, the parent group is inherited from the previous group or the device color space */ - if (pgs != NULL && pparams->group_color != UNKNOWN) { + if (pgs != NULL && pparams->group_color_type != UNKNOWN) { const gs_color_space *cs = gs_currentcolorspace_inline(pgs); code = pdf_color_space_named(pdev, pgs, &cs_value, NULL, cs, @@ -274,7 +274,7 @@ pdf_begin_transparency_mask(gs_gstate * pgs, gx_device_pdf * pdev, const gs_pdf14trans_params_t * pparams) { if (pparams->subtype == TRANSPARENCY_MASK_None) { - int code, id = pgs->soft_mask_id; + int code; pdf_resource_t *pres = 0L; /* reset the soft mask ID. Apparently this is only used by pdfwrite, if we don't @@ -284,10 +284,11 @@ pdf_begin_transparency_mask(gs_gstate * pgs, gx_device_pdf * pdev, pgs->soft_mask_id = 0; code = pdf_prepare_drawing(pdev, pgs, &pres, false); if (code == gs_error_interrupt) { - /* Not in an appropriate context, ignore it but restore - * the old soft_mask_id. Not sure this is correct, but it works for now. + /* */ + /* Not in an appropriate context. Do not restore the soft_mask_id. + Otherwise any group push that occurs following this will use that + softmask, which clearly should be NONE here. */ - pgs->soft_mask_id = id; /* ignore return code, we don't care about this graphics state as we aren't * emitting it anyway */ |