3 files changed, 41 insertions, 8 deletions

diff --git a/Resource/Init/pdf_draw.ps b/Resource/Init/pdf_draw.ps
index 6b0ba93e1..79733df45 100644
--- a/Resource/Init/pdf_draw.ps
+++ b/Resource/Init/pdf_draw.ps
@@ -797,7 +797,7 @@ currentdict /csncompdict undef
   mark exch { oforce } forall .dicttomark
   dup dup //true resolvestream
   /ReusableStreamDecode filter /DataSource exch put
-
+  dup /.hash 0 put      % placeholder for use by seticc icc_profile_cache key
   % Check that the number of components (/N) defined in the ICCBased
   % dictionry matches the actual profile. Bug #696120
   dup /N get
diff --git a/base/gsicc_profilecache.c b/base/gsicc_profilecache.c
index 6520ba08e..bf71c2e37 100644
--- a/base/gsicc_profilecache.c
+++ b/base/gsicc_profilecache.c
@@ -113,6 +113,9 @@ gsicc_add_cs(gs_gstate * pgs, gs_color_space * colorspace, uint64_t dictkey)
     result->color_space = colorspace;
     rc_increment(colorspace);
     result->key = dictkey;
+    if_debug2m(gs_debug_flag_icc, memory,
+               "[icc] Add cs to cache = 0x%p, hash = %lld \n",
+               result->color_space, (uint64_t)result->key);
     profile_cache->num_entries++;
 }
 
@@ -125,6 +128,9 @@ gsicc_find_cs(uint64_t key_test, gs_gstate * pgs)
     /* Look through the cache for the key. If found, move to MRU */
     while (curr != NULL ){
         if (curr->key == key_test){
+            if_debug2m(gs_debug_flag_icc, pgs->memory,
+                       "[icc] Found cs = 0x%p, hash = %lld \n",
+                       curr->color_space, (uint64_t)curr->key);
             /* If not already at head of list, move this one there */
             if (curr != profile_cache->head) {
                 /* We need to move found one to the top of the list. */
@@ -175,6 +181,9 @@ gsicc_remove_cs_entry(gsicc_profile_cache_t *profile_cache)
     /* Decremented, but someone could still be referencing this */
     /* If found again in the source document, it will be regenerated
        and added back into the cache. */
+    if_debug2m(gs_debug_flag_icc, memory,
+               "[icc] Remove cs from cache = 0x%p, hash = %lld \n",
+               curr->color_space, (uint64_t)curr->key);
     rc_decrement(curr->color_space, "gsicc_remove_cs_entry");
     gs_free_object(memory->stable_memory, curr, "gsicc_remove_cs_entry");
 }
diff --git a/psi/zicc.c b/psi/zicc.c
index dbd2562c7..f9c7b1ec5 100644
--- a/psi/zicc.c
+++ b/psi/zicc.c
@@ -47,6 +47,7 @@ int seticc(i_ctx_t * i_ctx_p, int ncomps, ref *ICCdict, float *range_buff)
     int                     code, k;
     gs_color_space *        pcs;
     ref *                   pstrmval;
+    ref *                   phashval = NULL;
     stream *                s = 0L;
     cmm_profile_t           *picc_profile = NULL;
     int                     i, expected = 0;
@@ -58,13 +59,27 @@ int seticc(i_ctx_t * i_ctx_p, int ncomps, ref *ICCdict, float *range_buff)
             GSICC_STANDARD_PROFILES_KEYS
         };
 
+    /* If we are override ICC mode, we won't use the profile */
+    if (!gs_currentoverrideicc(igs) &&
+        dict_find_string(ICCdict, ".hash", &phashval) == 1 &&
+        r_has_type(phashval, t_integer)) {
+        pcs = gsicc_find_cs(phashval->value.intval, igs);
+        if (pcs != NULL) {
+            /* Set the color space.  We are done. */
+            code = gs_setcolorspace(igs, pcs);
+            /* Remove the ICC dict from the stack */
+            pop(1);
+            return code;
+        }
+    }
+
     /* verify the DataSource entry */
     if (dict_find_string(ICCdict, "DataSource", &pstrmval) <= 0)
         return_error(gs_error_undefined);
     check_read_file(i_ctx_p, s, pstrmval);
 
     /* build the color space object */
-    code = gs_cspace_build_ICC(&pcs, NULL, gs_gstate_memory(igs));
+    code = gs_cspace_build_ICC(&pcs, NULL, gs_gstate_memory(igs)->stable_memory);
     if (code < 0)
         return gs_rethrow(code, "building color space object");
     /*  For now, dump the profile into a buffer
@@ -198,18 +213,27 @@ int seticc(i_ctx_t * i_ctx_p, int ncomps, ref *ICCdict, float *range_buff)
         }
         /* Have one increment from the color space.  Having these tied
            together is not really correct.  Need to fix that.  ToDo.  MJV */
-        rc_adjust(picc_profile, -2, "seticc");
+        rc_adjust(picc_profile, -2, "seticc");  /* NB: May free the profile and set picc_profile to 0 */
         rc_increment(pcs->cmm_icc_profile_data);
     }
-    /* Set the color space.  We are done.  No joint cache here... */
+    /* Set the color space.  We are done. */
     code = gs_setcolorspace(igs, pcs);
     /* The context has taken a reference to the colorspace. We no longer need
      * ours, so drop it. */
     rc_decrement_only(pcs, "seticc");
-    /* In this case, we already have a ref count of 2 on the icc profile
-       one for when it was created and one for when it was set.  We really
-       only want one here so adjust */
-    rc_decrement(picc_profile,"seticc");
+    if (picc_profile != NULL) {
+        /* In this case, we already have a ref count of 2 on the icc profile
+           one for when it was created and one for when it was set.  We really
+           only want one here so adjust */
+        rc_decrement(picc_profile,"seticc");
+        if (code >= 0) {
+            /* Save this colorspace in the iccprofile_cache */
+            gsicc_add_cs(igs, pcs, picc_profile->hashcode);
+            /* should be an integer, but if for some reason it isn't, don't update */
+            if (phashval && r_has_type(phashval, t_integer))
+                phashval->value.intval = picc_profile->hashcode;
+        }
+    }
     /* Remove the ICC dict from the stack */
     pop(1);
     return code;