Fix logic on retain_any_comps computation

2 files changed, 8 insertions, 4 deletions

diff --git a/base/gscdevn.c b/base/gscdevn.c
index 18ea7d6ef..56c568fbf 100644
--- a/base/gscdevn.c
+++ b/base/gscdevn.c
@@ -738,7 +738,11 @@ gx_set_overprint_DeviceN(const gs_color_space * pcs, gs_gstate * pgs)
     } else {
         gs_overprint_params_t   params;
 
-        if ((params.retain_any_comps = (pgs->overprint || pgs->stroke_overprint))) {
+
+        params.retain_any_comps = (pgs->overprint && pgs->is_fill_color) ||
+                                  (pgs->stroke_overprint && !pgs->is_fill_color);
+
+        if (params.retain_any_comps) {
             int     i, ncomps = pcs->params.device_n.num_components;
 
             params.is_fill_color = pgs->is_fill_color;	/* for fill_stroke */
diff --git a/base/gscsepr.c b/base/gscsepr.c
index 09317e4c9..70f36d667 100644
--- a/base/gscsepr.c
+++ b/base/gscsepr.c
@@ -190,9 +190,9 @@ gx_set_overprint_Separation(const gs_color_space * pcs, gs_gstate * pgs)
     else {
         gs_overprint_params_t   params;
 
-        /* We should not have to blend if we don't need the alternate tint transform */
-        params.retain_any_comps = (pgs->overprint || pgs->stroke_overprint) &&
-                                  pcs->params.separation.sep_type != SEP_ALL;
+        params.retain_any_comps = (((pgs->overprint && pgs->is_fill_color) ||
+                                   (pgs->stroke_overprint && !pgs->is_fill_color)) &&
+                                   (pcs->params.separation.sep_type != SEP_ALL));
         params.is_fill_color = pgs->is_fill_color;
         params.drawn_comps = 0;
         params.op_state = OP_STATE_NONE;