Fix for bug 692392. This makes sure that the transfer function is only applied to the K channel when we are mapping gray to CMYK.

Also fix for case in which interpolation of 12bit images does not work when using the ICC rendering operation.

10 files changed, 59 insertions, 20 deletions

diff --git a/gs/base/gdevp14.c b/gs/base/gdevp14.c
index 13ca28eb4..3ae3a18e9 100644
--- a/gs/base/gdevp14.c
+++ b/gs/base/gdevp14.c
@@ -4402,7 +4402,8 @@ pdf14_cmap_rgb_direct(frac r, frac g, frac b, gx_device_color *	pdc,
 
 static  void
 pdf14_cmap_cmyk_direct(frac c, frac m, frac y, frac k, gx_device_color * pdc,
-     const gs_imager_state * pis, gx_device * dev, gs_color_select_t select)
+     const gs_imager_state * pis, gx_device * dev, gs_color_select_t select,
+     const gs_color_space *pcs)
 {
     int i,ncomps;
     frac cm_comps[GX_DEVICE_COLOR_MAX_COMPONENTS];
@@ -4528,7 +4529,8 @@ pdf14_cmap_rgb_direct_group(frac r, frac g, frac b, gx_device_color *	pdc,
 /* color mapping for when we have an smask or a isolated transparency group with another color space */
 static  void
 pdf14_cmap_cmyk_direct_group(frac c, frac m, frac y, frac k, gx_device_color * pdc,
-     const gs_imager_state * pis, gx_device * dev, gs_color_select_t select)
+     const gs_imager_state * pis, gx_device * dev, gs_color_select_t select,
+     const gs_color_space *pcs)
 {
     int i, ncomps = dev->color_info.num_components;
     frac cm_comps[GX_DEVICE_COLOR_MAX_COMPONENTS];
diff --git a/gs/base/gdevplnx.c b/gs/base/gdevplnx.c
index 655ba0219..ff03cc342 100644
--- a/gs/base/gdevplnx.c
+++ b/gs/base/gdevplnx.c
@@ -860,7 +860,8 @@ plane_cmap_rgb(frac r, frac g, frac b, gx_device_color * pdc,
 }
 static void
 plane_cmap_cmyk(frac c, frac m, frac y, frac k, gx_device_color * pdc,
-    const gs_imager_state *pis_image, gx_device *dev, gs_color_select_t select)
+    const gs_imager_state *pis_image, gx_device *dev, gs_color_select_t select,
+    const gs_color_space *source_pcs)
 {
     const plane_image_enum_t *ppie =
         (const plane_image_enum_t *)pis_image->client_data;
@@ -870,7 +871,7 @@ plane_cmap_cmyk(frac c, frac m, frac y, frac k, gx_device_color * pdc,
     gx_device_color dcolor;
 
     gx_remap_concrete_cmyk(c, m, y, k, &dcolor, ppie->pis,
-                           (gx_device *)edev, select);
+                           (gx_device *)edev, select, NULL);
     reduce_drawing_color(pdc, edev, &dcolor, &lop);
 }
 static void
diff --git a/gs/base/gsciemap.c b/gs/base/gsciemap.c
index dced18d82..0e1e98ebe 100644
--- a/gs/base/gsciemap.c
+++ b/gs/base/gsciemap.c
@@ -211,6 +211,7 @@ gx_ciedefg_to_icc(gs_color_space **ppcs_icc, gs_color_space *pcs, gs_memory_t *m
     gsicc_init_profile_info((*ppcs_icc)->cmm_icc_profile_data);
     (*ppcs_icc)->cmm_icc_profile_data->default_match = CIE_DEFG;
     pcs->icc_equivalent = *ppcs_icc;
+    pcs->icc_equivalent->cmm_icc_profile_data->data_cs = gsCMYK;
     return(0);
 }
 
@@ -481,6 +482,7 @@ gx_ciedef_to_icc(gs_color_space **ppcs_icc, gs_color_space *pcs, gs_memory_t *me
     (*ppcs_icc)->cmm_icc_profile_data->default_match = CIE_DEF;
     /* Assign to the icc_equivalent member variable */
     pcs->icc_equivalent = *ppcs_icc;
+    pcs->icc_equivalent->cmm_icc_profile_data->data_cs = gsUNDEFINED;
     return(0);
     }
 
@@ -577,7 +579,8 @@ gx_cieabc_to_icc(gs_color_space **ppcs_icc, gs_color_space *pcs, bool *islab,
     (*ppcs_icc)->cmm_icc_profile_data->default_match = CIE_ABC;
     /* Assign to the icc_equivalent member variable */
     pcs->icc_equivalent = *ppcs_icc;
-                                return(0);
+    pcs->icc_equivalent->cmm_icc_profile_data->data_cs = gsRGB;
+    return(0);
     }
 
 /* Render a CIEBasedABC color. */
@@ -676,6 +679,7 @@ gx_ciea_to_icc(gs_color_space **ppcs_icc, gs_color_space *pcs, gs_memory_t *memo
     (*ppcs_icc)->cmm_icc_profile_data->default_match = CIE_A;
     /* Assign to the icc_equivalent member variable */
     pcs->icc_equivalent = *ppcs_icc;
+    pcs->icc_equivalent->cmm_icc_profile_data->data_cs = gsGRAY;
     return(code);
 }
 
diff --git a/gs/base/gsequivc.c b/gs/base/gsequivc.c
index 005661edc..70061a2f3 100644
--- a/gs/base/gsequivc.c
+++ b/gs/base/gsequivc.c
@@ -329,7 +329,8 @@ cmap_rgb_capture_cmyk_color(frac r, frac g, frac b, gx_device_color * pdc,
 
 static void
 cmap_cmyk_capture_cmyk_color(frac c, frac m, frac y, frac k, gx_device_color * pdc,
-     const gs_imager_state * pis, gx_device * dev, gs_color_select_t select)
+     const gs_imager_state * pis, gx_device * dev, gs_color_select_t select,
+     const gs_color_space *pcs)
 {
     equivalent_cmyk_color_params * pparams =
             ((color_capture_device *)dev)->pequiv_cmyk_colors;
diff --git a/gs/base/gsicc.c b/gs/base/gsicc.c
index ed66d0444..6fe4c4224 100644
--- a/gs/base/gsicc.c
+++ b/gs/base/gsicc.c
@@ -290,7 +290,7 @@ gx_remap_concrete_ICC(const frac * pconc, const gs_color_space * pcs,
             code = -1;
             break;
         }
-    return(code);
+    return code;
     }
 
 /*
diff --git a/gs/base/gxcmap.c b/gs/base/gxcmap.c
index 2b50b475e..b7c9143f0 100644
--- a/gs/base/gxcmap.c
+++ b/gs/base/gxcmap.c
@@ -736,7 +736,7 @@ gx_remap_concrete_DCMYK(const frac * pconc, const gs_color_space * pcs,
 {
 /****** IGNORE alpha ******/
     gx_remap_concrete_cmyk(pconc[0], pconc[1], pconc[2], pconc[3], pdc,
-                           pis, dev, select);
+                           pis, dev, select, pcs);
     return 0;
 }
 int
@@ -755,7 +755,7 @@ gx_remap_DeviceCMYK(const gs_client_color * pc, const gs_color_space * pcs,
                            gx_unit_frac(pc->paint.values[1]),
                            gx_unit_frac(pc->paint.values[2]),
                            gx_unit_frac(pc->paint.values[3]),
-                           pdc, pis, dev, select);
+                           pdc, pis, dev, select, pcs);
     return 0;
 }
 
@@ -917,12 +917,18 @@ cmap_rgb_direct(frac r, frac g, frac b, gx_device_color * pdc,
 
 static void
 cmap_cmyk_direct(frac c, frac m, frac y, frac k, gx_device_color * pdc,
-     const gs_imager_state * pis, gx_device * dev, gs_color_select_t select)
+     const gs_imager_state * pis, gx_device * dev, gs_color_select_t select,
+     const gs_color_space *source_pcs)
 {
     int i, ncomps = dev->color_info.num_components;
     frac cm_comps[GX_DEVICE_COLOR_MAX_COMPONENTS];
     gx_color_value cv[GX_DEVICE_COLOR_MAX_COMPONENTS];
     gx_color_index color;
+    int black_index;
+    cmm_dev_profile_t *dev_profile;
+    gsicc_colorbuffer_t src_space = gsUNDEFINED;
+    int code;
+    bool gray_to_k;
 
     /* map to the color model */
     for (i=0; i < ncomps; i++)
@@ -934,11 +940,30 @@ cmap_cmyk_direct(frac c, frac m, frac y, frac k, gx_device_color * pdc,
         for (i = 0; i < ncomps; i++)
             cm_comps[i] = gx_map_color_frac(pis,
                                 cm_comps[i], effective_transfer[i]);
-    else
-        for (i = 0; i < ncomps; i++)
-            cm_comps[i] = frac_1 - gx_map_color_frac(pis,
-                        (frac)(frac_1 - cm_comps[i]), effective_transfer[i]);
-
+    else {
+        /* Check if source space is gray.  In this case we are to use only the
+           transfer function on the K channel.  Do this only if gray to K is
+           also set */
+        code = dev_proc(dev, get_profile)(dev, &dev_profile);
+        gray_to_k = dev_profile->devicegraytok;
+        if (source_pcs != NULL && source_pcs->cmm_icc_profile_data != NULL) {
+            src_space = source_pcs->cmm_icc_profile_data->data_cs;
+        } else if (source_pcs != NULL && source_pcs->icc_equivalent != NULL) {
+            src_space = source_pcs->icc_equivalent->cmm_icc_profile_data->data_cs;
+        }
+        if (src_space == gsGRAY && gray_to_k) {
+            /* Find the black channel location */
+            black_index = dev_proc(dev, get_color_comp_index)(dev, "Black",
+                                    strlen("Black"), SEPARATION_NAME);
+            cm_comps[black_index] = frac_1 - gx_map_color_frac(pis,
+                                    (frac)(frac_1 - cm_comps[black_index]), 
+                                    effective_transfer[black_index]);
+        } else {
+            for (i = 0; i < ncomps; i++)
+                cm_comps[i] = frac_1 - gx_map_color_frac(pis,
+                            (frac)(frac_1 - cm_comps[i]), effective_transfer[i]);
+        }
+    }
     /* We make a test for direct vs. halftoned, rather than */
     /* duplicating most of the code of this procedure. */
     if (gx_device_must_halftone(dev)) {
diff --git a/gs/base/gxcmap.h b/gs/base/gxcmap.h
index bc5fa8790..0b5cb99cd 100644
--- a/gs/base/gxcmap.h
+++ b/gs/base/gxcmap.h
@@ -20,6 +20,7 @@
 
 #include "gscsel.h"
 #include "gxfmap.h"
+#include "gscspace.h"
 
 #ifndef gx_device_DEFINED
 #  define gx_device_DEFINED
@@ -40,7 +41,8 @@ typedef struct gx_device_color_s gx_device_color;
             gx_device *, gs_color_select_t)
 #define cmap_proc_cmyk(proc)\
   void proc(frac, frac, frac, frac, gx_device_color *,\
-            const gs_imager_state *, gx_device *, gs_color_select_t)
+            const gs_imager_state *, gx_device *, gs_color_select_t,\
+            const gs_color_space *)
 #define cmap_proc_rgb_alpha(proc)\
   void proc(frac, frac, frac, frac, gx_device_color *,\
                const gs_imager_state *, gx_device *, gs_color_select_t)
@@ -143,8 +145,8 @@ void gx_set_cmap_procs(gs_imager_state *, const gx_device *);
   ((pis)->cmap_procs->map_gray)(cgray, pdc, pis, dev, select)
 #define gx_remap_concrete_rgb(cr, cg, cb, pdc, pis, dev, select)\
   ((pis)->cmap_procs->map_rgb)(cr, cg, cb, pdc, pis, dev, select)
-#define gx_remap_concrete_cmyk(cc, cm, cy, ck, pdc, pis, dev, select)\
-  ((pis)->cmap_procs->map_cmyk)(cc, cm, cy, ck, pdc, pis, dev, select)
+#define gx_remap_concrete_cmyk(cc, cm, cy, ck, pdc, pis, dev, select, pcs)\
+  ((pis)->cmap_procs->map_cmyk)(cc, cm, cy, ck, pdc, pis, dev, select, pcs)
 #define gx_remap_concrete_rgb_alpha(cr, cg, cb, ca, pdc, pis, dev, select)\
   ((pis)->cmap_procs->map_rgb_alpha)(cr, cg, cb, ca, pdc, pis, dev, select)
 #define gx_remap_concrete_separation(pcc, pdc, pis, dev, select)\
diff --git a/gs/base/gxi12bit.c b/gs/base/gxi12bit.c
index d2c496bcc..55e5367bc 100644
--- a/gs/base/gxi12bit.c
+++ b/gs/base/gxi12bit.c
@@ -291,7 +291,7 @@ image_render_frac(gx_image_enum * penum, const byte * buffer, int data_x,
                     (*map_cmyk) (next.v[0], next.v[1],
                                  next.v[2], next.v[3],
                                  pdevc_next, pis, dev,
-                                 gs_color_select_source);
+                                 gs_color_select_source, NULL);
                     goto f;
                 }
                 decode_frac(next.v[0], cc, 0);
diff --git a/gs/base/gxiscale.c b/gs/base/gxiscale.c
index 2b1fdd92b..02bd4a62f 100644
--- a/gs/base/gxiscale.c
+++ b/gs/base/gxiscale.c
@@ -96,6 +96,9 @@ gs_image_class_0_interpolate(gx_image_enum * penum)
             use_icc = true;
         }
     }
+    if (!(penum->bps <= 8 || penum->bps == 16)) {
+        use_icc = false;
+    }
     /* Do not allow mismatch in devices component output with the
        profile output size.  For example sep device with CMYK profile should
        not go through the fast method */
diff --git a/gs/base/lib.mak b/gs/base/lib.mak
index 6d2ff9743..2b0619e32 100644
--- a/gs/base/lib.mak
+++ b/gs/base/lib.mak
@@ -492,7 +492,8 @@ gscolor2_h=$(GLSRC)gscolor2.h $(gscindex_h) $(gsptype1_h)
 gscsepr_h=$(GLSRC)gscsepr.h $(gscspace_h)
 gxdcconv_h=$(GLSRC)gxdcconv.h $(gxfrac_h)
 gxfmap_h=$(GLSRC)gxfmap.h $(gsrefct_h) $(gsstype_h) $(gxfrac_h) $(gxtmap_h)
-gxcmap_h=$(GLSRC)gxcmap.h $(gscsel_h) $(gxcindex_h) $(gxcvalue_h) $(gxfmap_h)
+gxcmap_h=$(GLSRC)gxcmap.h $(gscsel_h) $(gxcindex_h) $(gxcvalue_h) $(gxfmap_h)\
+ $(gscspace_h)
 gxistate_h=$(GLSRC)gxistate.h\
  $(gscsel_h) $(gsrefct_h) $(gsropt_h) $(gstparam_h) $(gxcvalue_h) $(gxcmap_h)\
  $(gxfixed_h) $(gxline_h) $(gxmatrix_h) $(gxtmap_h) $(gscspace_h) $(gstrans_h)\