Attachment 107868 Details for Bug 27068 – ps: emit icc colorspaces

[patch] ps: emit icc colorspaces

0001-PS-emit-icc-color-spaces.patch (text/plain), 20.56 KB, created by Adrian Johnson on 2014-10-15 12:24:11 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Adrian Johnson

Created: 2014-10-15 12:24:11 UTC

Size: 20.56 KB

patch

obsolete

>From c33aac94f6da9e08c91b312e5c5eee555ca32719 Mon Sep 17 00:00:00 2001
>From: Adrian Johnson <ajohnson@redneon.com>
>Date: Sun, 12 Oct 2014 15:08:39 +1030
>Subject: [PATCH] PS: emit icc color spaces
>
>Bug 27068
>---
> poppler/GfxState.cc    | 115 +++++++++++++++++++++++++++++++++----------------
> poppler/GfxState.h     |  11 ++++-
> poppler/PSOutputDev.cc |  80 ++++++++++++++++++++++++++--------
> poppler/PSOutputDev.h  |   8 ++--
> 4 files changed, 155 insertions(+), 59 deletions(-)
>
>diff --git a/poppler/GfxState.cc b/poppler/GfxState.cc
>index eae85dc..aee52df 100644
>--- a/poppler/GfxState.cc
>+++ b/poppler/GfxState.cc
>@@ -203,15 +203,22 @@ void GfxColorTransform::doTransform(void *in, void *out, unsigned int size) {
> }
> 
> // transformA should be a cmsHTRANSFORM
>-GfxColorTransform::GfxColorTransform(void *transformA, int cmsIntentA, unsigned int transformPixelTypeA) {
>+GfxColorTransform::GfxColorTransform(void *sourceProfileA, void *transformA,
>+				     int cmsIntentA, unsigned int transformPixelTypeA) {
>+  sourceProfile = sourceProfileA;
>   transform = transformA;
>   refCount = 1;
>   cmsIntent = cmsIntentA;
>   transformPixelType = transformPixelTypeA;
>+  psCSA = NULL;
> }
> 
> GfxColorTransform::~GfxColorTransform() {
>+  if (sourceProfile)
>+    cmsCloseProfile(sourceProfile);
>   cmsDeleteTransform(transform);
>+  if (psCSA)
>+    gfree(psCSA);
> }
> 
> void GfxColorTransform::ref() {
>@@ -222,6 +229,39 @@ unsigned int GfxColorTransform::unref() {
>   return --refCount;
> }
> 
>+char *GfxColorTransform::getPostScriptCSA()
>+{
>+  int size;
>+
>+  if (psCSA)
>+    return psCSA;
>+
>+  if (sourceProfile == NULL) {
>+    error(errSyntaxWarning, -1, "profile is NULL");
>+    return NULL;
>+  }
>+
>+#if USE_LCMS1
>+  size = cmsGetPostScriptCSA(sourceProfile, cmsIntent, NULL, 0);
>+#else
>+  size = cmsGetPostScriptCSA(cmsGetProfileContextID(sourceProfile), sourceProfile, cmsIntent, 0, NULL, 0);
>+#endif
>+  if (size == 0) {
>+    error(errSyntaxWarning, -1, "PostScript CSA is NULL");
>+    return NULL;
>+  }
>+
>+  psCSA = (char*)gmalloc(size+1);
>+#if USE_LCMS1
>+  cmsGetPostScriptCSA(sourceProfile, cmsIntent, psCSA, size);
>+#else
>+  cmsGetPostScriptCSA(cmsGetProfileContextID(sourceProfile), sourceProfile, cmsIntent, 0, psCSA, size);
>+#endif
>+  psCSA[size] = 0;
>+
>+  return psCSA;
>+}
>+
> static cmsHPROFILE RGBProfile = NULL;
> static GooString *displayProfileName = NULL; // display profile file Name
> static cmsHPROFILE displayProfile = NULL; // display profile
>@@ -250,9 +290,8 @@ void GfxColorSpace::setDisplayProfile(void *displayProfileA) {
> 	  INTENT_RELATIVE_COLORIMETRIC,LCMS_FLAGS)) == 0) {
>       error(errSyntaxWarning, -1, "Can't create Lab transform");
>     } else {
>-      XYZ2DisplayTransform = new GfxColorTransform(transform, INTENT_RELATIVE_COLORIMETRIC, displayPixelType);
>+      XYZ2DisplayTransform = new GfxColorTransform(displayProfile, transform, INTENT_RELATIVE_COLORIMETRIC, displayPixelType);
>     }
>-    cmsCloseProfile(XYZProfile);
>   }
> }
> 
>@@ -451,8 +490,9 @@ int GfxColorSpace::setupColorProfiles()
> 	     CHANNELS_SH(nChannels) | BYTES_SH(1),
> 	  INTENT_RELATIVE_COLORIMETRIC,LCMS_FLAGS)) == 0) {
>       error(errSyntaxWarning, -1, "Can't create Lab transform");
>+      cmsCloseProfile(XYZProfile);
>     } else {
>-      XYZ2DisplayTransform = new GfxColorTransform(transform, INTENT_RELATIVE_COLORIMETRIC, displayPixelType);
>+      XYZ2DisplayTransform = new GfxColorTransform(XYZProfile, transform, INTENT_RELATIVE_COLORIMETRIC, displayPixelType);
>     }
>     cmsCloseProfile(XYZProfile);
>   }
>@@ -1830,18 +1870,8 @@ GfxColorSpace *GfxICCBasedColorSpace::parse(Array *arr, OutputDev *out, GfxState
>       cs = static_cast<GfxICCBasedColorSpace*>(item->cs->copy());
>       int transformIntent = cs->getIntent();
>       int cmsIntent = INTENT_RELATIVE_COLORIMETRIC;
>-      if (state != NULL) {
>-        const char *intent = state->getRenderingIntent();
>-        if (intent != NULL) {
>-          if (strcmp(intent, "AbsoluteColorimetric") == 0) {
>-            cmsIntent = INTENT_ABSOLUTE_COLORIMETRIC;
>-          } else if (strcmp(intent, "Saturation") == 0) {
>-            cmsIntent = INTENT_SATURATION;
>-          } else if (strcmp(intent, "Perceptual") == 0) {
>-            cmsIntent = INTENT_PERCEPTUAL;
>-          }
>-        }
>-      }
>+      if (state != NULL)
>+	cmsIntent = state->getCmsRenderingIntent();
>       if (transformIntent == cmsIntent) {
>         return cs;
>       }
>@@ -1929,18 +1959,8 @@ GfxColorSpace *GfxICCBasedColorSpace::parse(Array *arr, OutputDev *out, GfxState
>     cmsHTRANSFORM transform;
> 
>     int cmsIntent = INTENT_RELATIVE_COLORIMETRIC;
>-    if (state != NULL) {
>-      const char *intent = state->getRenderingIntent();
>-      if (intent != NULL) {
>-        if (strcmp(intent, "AbsoluteColorimetric") == 0) {
>-          cmsIntent = INTENT_ABSOLUTE_COLORIMETRIC;
>-        } else if (strcmp(intent, "Saturation") == 0) {
>-          cmsIntent = INTENT_SATURATION;
>-        } else if (strcmp(intent, "Perceptual") == 0) {
>-          cmsIntent = INTENT_PERCEPTUAL;
>-        }
>-      }
>-    }
>+    if (state != NULL)
>+      cmsIntent = state->getCmsRenderingIntent();
>     if ((transform = cmsCreateTransform(hp,
> 	   COLORSPACE_SH(cst) |CHANNELS_SH(nCompsA) | BYTES_SH(1),
> 	   dhp,
>@@ -1950,7 +1970,7 @@ GfxColorSpace *GfxICCBasedColorSpace::parse(Array *arr, OutputDev *out, GfxState
>       error(errSyntaxWarning, -1, "Can't create transform");
>       cs->transform = NULL;
>     } else {
>-      cs->transform = new GfxColorTransform(transform, cmsIntent, dcst);
>+      cs->transform = new GfxColorTransform(hp, transform, cmsIntent, dcst);
>     }
>     if (dcst == PT_RGB || dcst == PT_CMYK) {
>        // create line transform only when the display is RGB type color space 
>@@ -1960,10 +1980,9 @@ GfxColorSpace *GfxICCBasedColorSpace::parse(Array *arr, OutputDev *out, GfxState
> 	error(errSyntaxWarning, -1, "Can't create transform");
> 	cs->lineTransform = NULL;
>       } else {
>-	cs->lineTransform = new GfxColorTransform(transform, cmsIntent, dcst);
>+	cs->lineTransform = new GfxColorTransform(NULL, transform, cmsIntent, dcst);
>       }
>     }
>-    cmsCloseProfile(hp);
>   }
>   obj1.free();
>   // put this colorSpace into cache
>@@ -2395,6 +2414,16 @@ void GfxICCBasedColorSpace::getDefaultRanges(double *decodeLow,
> #endif
> }
> 
>+#ifdef USE_CMS
>+char *GfxICCBasedColorSpace::getPostScriptCSA()
>+{
>+  if (transform)
>+    return transform->getPostScriptCSA();
>+  else
>+    return NULL;
>+}
>+#endif
>+
> //------------------------------------------------------------------------
> // GfxIndexedColorSpace
> //------------------------------------------------------------------------
>@@ -6668,7 +6697,7 @@ void GfxState::setDisplayProfile(cmsHPROFILE localDisplayProfileA) {
> 	  INTENT_RELATIVE_COLORIMETRIC,LCMS_FLAGS)) == 0) {
>       error(errSyntaxWarning, -1, "Can't create Lab transform");
>     } else {
>-      XYZ2DisplayTransformRelCol = new GfxColorTransform(transform, INTENT_RELATIVE_COLORIMETRIC, localDisplayPixelType);
>+      XYZ2DisplayTransformRelCol = new GfxColorTransform(XYZProfile, transform, INTENT_RELATIVE_COLORIMETRIC, localDisplayPixelType);
>     }
>     if ((transform = cmsCreateTransform(XYZProfile, TYPE_XYZ_DBL,
> 	   localDisplayProfile,
>@@ -6677,7 +6706,7 @@ void GfxState::setDisplayProfile(cmsHPROFILE localDisplayProfileA) {
> 	  INTENT_ABSOLUTE_COLORIMETRIC,LCMS_FLAGS)) == 0) {
>       error(errSyntaxWarning, -1, "Can't create Lab transform");
>     } else {
>-      XYZ2DisplayTransformAbsCol = new GfxColorTransform(transform, INTENT_ABSOLUTE_COLORIMETRIC, localDisplayPixelType);
>+      XYZ2DisplayTransformAbsCol = new GfxColorTransform(XYZProfile, transform, INTENT_ABSOLUTE_COLORIMETRIC, localDisplayPixelType);
>     }
>     if ((transform = cmsCreateTransform(XYZProfile, TYPE_XYZ_DBL,
> 	   localDisplayProfile,
>@@ -6686,7 +6715,7 @@ void GfxState::setDisplayProfile(cmsHPROFILE localDisplayProfileA) {
> 	  INTENT_SATURATION,LCMS_FLAGS)) == 0) {
>       error(errSyntaxWarning, -1, "Can't create Lab transform");
>     } else {
>-      XYZ2DisplayTransformSat = new GfxColorTransform(transform, INTENT_SATURATION, localDisplayPixelType);
>+      XYZ2DisplayTransformSat = new GfxColorTransform(XYZProfile, transform, INTENT_SATURATION, localDisplayPixelType);
>     }
>     if ((transform = cmsCreateTransform(XYZProfile, TYPE_XYZ_DBL,
> 	   localDisplayProfile,
>@@ -6695,9 +6724,8 @@ void GfxState::setDisplayProfile(cmsHPROFILE localDisplayProfileA) {
> 	  INTENT_PERCEPTUAL,LCMS_FLAGS)) == 0) {
>       error(errSyntaxWarning, -1, "Can't create Lab transform");
>     } else {
>-      XYZ2DisplayTransformPerc = new GfxColorTransform(transform, INTENT_PERCEPTUAL, localDisplayPixelType);
>+      XYZ2DisplayTransformPerc = new GfxColorTransform(XYZProfile, transform, INTENT_PERCEPTUAL, localDisplayPixelType);
>     }
>-    cmsCloseProfile(XYZProfile);
>   }
> }
> 
>@@ -6720,6 +6748,21 @@ GfxColorTransform *GfxState::getXYZ2DisplayTransform() {
>   return transform;
> }
> 
>+int GfxState::getCmsRenderingIntent() {
>+  const char *intent = getRenderingIntent();
>+  int cmsIntent = INTENT_RELATIVE_COLORIMETRIC;
>+  if (intent) {
>+    if (strcmp(intent, "AbsoluteColorimetric") == 0) {
>+      cmsIntent = INTENT_ABSOLUTE_COLORIMETRIC;
>+    } else if (strcmp(intent, "Saturation") == 0) {
>+      cmsIntent = INTENT_SATURATION;
>+    } else if (strcmp(intent, "Perceptual") == 0) {
>+      cmsIntent = INTENT_PERCEPTUAL;
>+    }
>+  }
>+  return cmsIntent;
>+}
>+
> #endif
> 
> void GfxState::setPath(GfxPath *pathA) {
>diff --git a/poppler/GfxState.h b/poppler/GfxState.h
>index 106b2c0..734effa 100644
>--- a/poppler/GfxState.h
>+++ b/poppler/GfxState.h
>@@ -182,18 +182,22 @@ class GfxColorTransform {
> public:
>   void doTransform(void *in, void *out, unsigned int size);
>   // transformA should be a cmsHTRANSFORM
>-  GfxColorTransform(void *transformA, int cmsIntent, unsigned int transformPixelType);
>+  GfxColorTransform(void *sourceProfileA, void *transformA, int cmsIntent, unsigned int transformPixelType);
>   ~GfxColorTransform();
>   int getIntent() { return cmsIntent; }
>   int getTransformPixelType() { return transformPixelType; }
>   void ref();
>   unsigned int unref();
>+  void *getSourceProfile() { return sourceProfile; }
>+  char *getPostScriptCSA();
> private:
>   GfxColorTransform() {}
>+  void *sourceProfile;
>   void *transform;
>   unsigned int refCount;
>   int cmsIntent;
>   unsigned int transformPixelType;
>+  char *psCSA;
> };
> 
> class GfxColorSpace {
>@@ -550,6 +554,10 @@ public:
> 
>   // ICCBased-specific access.
>   GfxColorSpace *getAlt() { return alt; }
>+  Ref getRef() { return iccProfileStream; }
>+#ifdef USE_CMS
>+  char *getPostScriptCSA();
>+#endif
> 
> private:
> 
>@@ -1540,6 +1548,7 @@ public:
>   void setDisplayProfile(void *localDisplayProfileA);
>   void *getDisplayProfile() { return localDisplayProfile; }
>   GfxColorTransform *getXYZ2DisplayTransform();
>+  int getCmsRenderingIntent();
> #endif
> 
>   // Add to path.
>diff --git a/poppler/PSOutputDev.cc b/poppler/PSOutputDev.cc
>index 149bb62..bc4b731 100644
>--- a/poppler/PSOutputDev.cc
>+++ b/poppler/PSOutputDev.cc
>@@ -1105,6 +1105,7 @@ PSOutputDev::PSOutputDev(const char *fileName, PDFDoc *doc,
>   haveTextClip = gFalse;
>   t3String = NULL;
>   forceRasterize = forceRasterizeA;
>+  iccEmitted = new GooHash(gTrue);
> 
>   // open file or pipe
>   if (!strcmp(fileName, "-")) {
>@@ -1461,6 +1462,7 @@ PSOutputDev::~PSOutputDev() {
>     customColors = cc->next;
>     delete cc;
>   }
>+  delete iccEmitted;
> }
> 
> void PSOutputDev::writeHeader(int firstPage, int lastPage,
>@@ -3804,6 +3806,16 @@ void PSOutputDev::endPage() {
>     (*overlayCbk)(this, overlayCbkData);
>   }
> 
>+  GooHashIter *iter;
>+  GooString *name;
>+  int value;
>+  iccEmitted->startIter(&iter);
>+  while (iccEmitted->getNext(&iter, &name, &value)) {
>+    writePSFmt("userdict /{0:t} undef\n", name);
>+  }
>+  iccEmitted->killIter(&iter);
>+  delete iccEmitted;
>+  iccEmitted = new GooHash(gTrue);
> 
>   if (mode == psModeForm) {
>     writePS("pdfEndPage\n");
>@@ -3814,8 +3826,8 @@ void PSOutputDev::endPage() {
>     if (!manualCtrl) {
>       writePS("showpage\n");
>     }
>-      writePS("%%PageTrailer\n");
>-      writePageTrailer();
>+    writePS("%%PageTrailer\n");
>+    writePageTrailer();
>     }
> }
> 
>@@ -3881,7 +3893,7 @@ void PSOutputDev::updateFillColorSpace(GfxState *state) {
>   case psLevel2:
>   case psLevel3:
>     if (state->getFillColorSpace()->getMode() != csPattern) {
>-      dumpColorSpaceL2(state->getFillColorSpace(), gTrue, gFalse, gFalse);
>+      dumpColorSpaceL2(state, state->getFillColorSpace(), gTrue, gFalse, gFalse);
>       writePS(" cs\n");
>     }
>     break;
>@@ -3902,7 +3914,7 @@ void PSOutputDev::updateStrokeColorSpace(GfxState *state) {
>   case psLevel2:
>   case psLevel3:
>     if (state->getStrokeColorSpace()->getMode() != csPattern) {
>-      dumpColorSpaceL2(state->getStrokeColorSpace(), gTrue, gFalse, gFalse);
>+      dumpColorSpaceL2(state, state->getStrokeColorSpace(), gTrue, gFalse, gFalse);
>       writePS(" CS\n");
>     }
>     break;
>@@ -5033,12 +5045,12 @@ void PSOutputDev::drawImageMask(GfxState *state, Object *ref, Stream *str,
>     break;
>     case psLevel2:
>     case psLevel2Sep:
>-      doImageL2(ref, NULL, invert, inlineImg, str, width, height, len,
>+      doImageL2(state, ref, NULL, invert, inlineImg, str, width, height, len,
>                 NULL, NULL, 0, 0, gFalse);
>     break;
>     case psLevel3:
>     case psLevel3Sep:
>-      doImageL3(ref, NULL, invert, inlineImg, str, width, height, len,
>+      doImageL3(state, ref, NULL, invert, inlineImg, str, width, height, len,
>                 NULL, NULL, 0, 0, gFalse);
>     break;
>   }
>@@ -5077,12 +5089,12 @@ void PSOutputDev::drawImage(GfxState *state, Object *ref, Stream *str,
>     break;
>   case psLevel2:
>   case psLevel2Sep:
>-    doImageL2(ref, colorMap, gFalse, inlineImg, str,
>+    doImageL2(state, ref, colorMap, gFalse, inlineImg, str,
> 	      width, height, len, maskColors, NULL, 0, 0, gFalse);
>     break;
>   case psLevel3:
>   case psLevel3Sep:
>-    doImageL3(ref, colorMap, gFalse, inlineImg, str,
>+    doImageL3(state, ref, colorMap, gFalse, inlineImg, str,
> 	      width, height, len, maskColors, NULL, 0, 0, gFalse);
>     break;
>   }
>@@ -5112,12 +5124,12 @@ void PSOutputDev::drawMaskedImage(GfxState *state, Object *ref, Stream *str,
>     break;
>   case psLevel2:
>   case psLevel2Sep:
>-    doImageL2(ref, colorMap, gFalse, gFalse, str, width, height, len,
>+    doImageL2(state, ref, colorMap, gFalse, gFalse, str, width, height, len,
> 	      NULL, maskStr, maskWidth, maskHeight, maskInvert);
>     break;
>   case psLevel3:
>   case psLevel3Sep:
>-    doImageL3(ref, colorMap, gFalse, gFalse, str, width, height, len,
>+    doImageL3(state, ref, colorMap, gFalse, gFalse, str, width, height, len,
> 	      NULL, maskStr, maskWidth, maskHeight, maskInvert);
>     break;
>   }
>@@ -5508,7 +5520,7 @@ void PSOutputDev::maskToClippingPath(Stream *maskStr, int maskWidth, int maskHei
>   maskStr->close();
> }
> 
>-void PSOutputDev::doImageL2(Object *ref, GfxImageColorMap *colorMap,
>+void PSOutputDev::doImageL2(GfxState *state, Object *ref, GfxImageColorMap *colorMap,
> 			    GBool invert, GBool inlineImg,
> 			    Stream *str, int width, int height, int len,
> 			    int *maskColors, Stream *maskStr,
>@@ -5696,7 +5708,7 @@ void PSOutputDev::doImageL2(Object *ref, GfxImageColorMap *colorMap,
> 
>   // color space
>   if (colorMap) {
>-    dumpColorSpaceL2(colorMap->getColorSpace(), gFalse, gTrue, gFalse);
>+    dumpColorSpaceL2(state, colorMap->getColorSpace(), gFalse, gTrue, gFalse);
>     writePS(" setcolorspace\n");
>   }
> 
>@@ -5972,7 +5984,7 @@ void PSOutputDev::doImageL2(Object *ref, GfxImageColorMap *colorMap,
> }
> 
> //~ this doesn't currently support OPI
>-void PSOutputDev::doImageL3(Object *ref, GfxImageColorMap *colorMap,
>+void PSOutputDev::doImageL3(GfxState *state, Object *ref, GfxImageColorMap *colorMap,
> 			    GBool invert, GBool inlineImg,
> 			    Stream *str, int width, int height, int len,
> 			    int *maskColors, Stream *maskStr,
>@@ -6072,7 +6084,7 @@ void PSOutputDev::doImageL3(Object *ref, GfxImageColorMap *colorMap,
> 
>   // color space
>   if (colorMap) {
>-    dumpColorSpaceL2(colorMap->getColorSpace(), gFalse, gTrue, gFalse);
>+    dumpColorSpaceL2(state, colorMap->getColorSpace(), gFalse, gTrue, gFalse);
>     writePS(" setcolorspace\n");
>   }
> 
>@@ -6345,7 +6357,7 @@ void PSOutputDev::doImageL3(Object *ref, GfxImageColorMap *colorMap,
>   }
> }
> 
>-void PSOutputDev::dumpColorSpaceL2(GfxColorSpace *colorSpace,
>+void PSOutputDev::dumpColorSpaceL2(GfxState *state, GfxColorSpace *colorSpace,
> 				   GBool genXform, GBool updateColors,
> 				   GBool map01) {
>   GfxCalGrayColorSpace *calGrayCS;
>@@ -6487,17 +6499,47 @@ void PSOutputDev::dumpColorSpaceL2(GfxColorSpace *colorSpace,
>     break;
> 
>   case csICCBased:
>+#if USE_CMS
>+    {
>+      GfxICCBasedColorSpace *iccBasedCS;
>+      iccBasedCS = (GfxICCBasedColorSpace *)colorSpace;
>+      Ref ref = iccBasedCS->getRef();
>+      int intent = state->getCmsRenderingIntent();
>+      GooString *name = GooString::format("ICCBased-{0:d}-{1:d}-{2:d}", ref.num, ref.gen, intent);
>+      if (iccEmitted->lookupInt(name)) {
>+	writePSFmt("{0:t}", name);
>+	if (genXform) {
>+	  writePS(" {}");
>+	}
>+      } else {
>+	char *csa = iccBasedCS->getPostScriptCSA();
>+	if (csa) {
>+	  writePSFmt("userdict /{0:t} {1:s} put\n", name, csa);
>+	  iccEmitted->add(name->copy(), 1);
>+	  writePSFmt("{0:t}", name);
>+	  if (genXform) {
>+	    writePS(" {}");
>+	  }
>+	} else {
>+	  dumpColorSpaceL2(state, ((GfxICCBasedColorSpace *)colorSpace)->getAlt(),
>+			   genXform, updateColors, gFalse);
>+	}
>+	delete name;
>+      }
>+    }
>+#else
>     // there is no transform function to the alternate color space, so
>     // we can use it directly
>     dumpColorSpaceL2(((GfxICCBasedColorSpace *)colorSpace)->getAlt(),
> 		     genXform, updateColors, gFalse);
>+#endif
>     break;
> 
>   case csIndexed:
>     indexedCS = (GfxIndexedColorSpace *)colorSpace;
>     baseCS = indexedCS->getBase();
>     writePS("[/Indexed ");
>-    dumpColorSpaceL2(baseCS, gFalse, gFalse, gTrue);
>+    dumpColorSpaceL2(state, baseCS, gFalse, gFalse, gTrue);
>     n = indexedCS->getIndexHigh();
>     numComps = baseCS->getNComps();
>     lookup = indexedCS->getLookup();
>@@ -6572,7 +6614,7 @@ void PSOutputDev::dumpColorSpaceL2(GfxColorSpace *colorSpace,
>     writePS("[/Separation ");
>     writePSString(separationCS->getName());
>     writePS(" ");
>-    dumpColorSpaceL2(separationCS->getAlt(), gFalse, gFalse, gFalse);
>+    dumpColorSpaceL2(state, separationCS->getAlt(), gFalse, gFalse, gFalse);
>     writePS("\n");
>     cvtFunction(separationCS->getFunc());
>     writePS("]");
>@@ -6594,7 +6636,7 @@ void PSOutputDev::dumpColorSpaceL2(GfxColorSpace *colorSpace,
>         writePS(" ");
>       }
>       writePS("]\n");
>-      dumpColorSpaceL2(deviceNCS->getAlt(), gFalse, updateColors, gFalse);
>+      dumpColorSpaceL2(state, deviceNCS->getAlt(), gFalse, updateColors, gFalse);
>       writePS("\n");
>       cvtFunction(deviceNCS->getTintTransformFunc(), map01 && deviceNCS->getAlt()->getMode() == csLab);
>       writePS("]\n");
>@@ -6603,7 +6645,7 @@ void PSOutputDev::dumpColorSpaceL2(GfxColorSpace *colorSpace,
>       }
>     } else {
>       // DeviceN color spaces are a Level 3 PostScript feature.
>-      dumpColorSpaceL2(deviceNCS->getAlt(), gFalse, updateColors, map01);
>+      dumpColorSpaceL2(state, deviceNCS->getAlt(), gFalse, updateColors, map01);
>       if (genXform) {
>         writePS(" ");
>         cvtFunction(deviceNCS->getTintTransformFunc());
>diff --git a/poppler/PSOutputDev.h b/poppler/PSOutputDev.h
>index f30204d..118ffdc 100644
>--- a/poppler/PSOutputDev.h
>+++ b/poppler/PSOutputDev.h
>@@ -352,17 +352,17 @@ private:
> 		    Stream *str, int width, int height, int len,
> 		    int *maskColors, Stream *maskStr,
> 		    int maskWidth, int maskHeight, GBool maskInvert);
>-  void doImageL2(Object *ref, GfxImageColorMap *colorMap,
>+  void doImageL2(GfxState *state, Object *ref, GfxImageColorMap *colorMap,
> 		 GBool invert, GBool inlineImg,
> 		 Stream *str, int width, int height, int len,
> 		 int *maskColors, Stream *maskStr,
> 		 int maskWidth, int maskHeight, GBool maskInvert);
>-  void doImageL3(Object *ref, GfxImageColorMap *colorMap,
>+  void doImageL3(GfxState *state, Object *ref, GfxImageColorMap *colorMap,
> 		 GBool invert, GBool inlineImg,
> 		 Stream *str, int width, int height, int len,
> 		 int *maskColors, Stream *maskStr,
> 		 int maskWidth, int maskHeight, GBool maskInvert);
>-  void dumpColorSpaceL2(GfxColorSpace *colorSpace,
>+  void dumpColorSpaceL2(GfxState *stae, GfxColorSpace *colorSpace,
> 			GBool genXform, GBool updateColors,
> 			GBool map01);
>   GBool tilingPatternFillL1(GfxState *state, Catalog *cat, Object *str,
>@@ -487,6 +487,8 @@ private:
>   GBool forceRasterize;		// forces the page to be rasterized into a image before printing
>   GBool displayText;		// displayText
> 
>+  GooHash *iccEmitted;          // contains ICCBased CSAs that have been emitted
>+
> #if OPI_SUPPORT
>   int opi13Nest;		// nesting level of OPI 1.3 objects
>   int opi20Nest;		// nesting level of OPI 2.0 objects
>-- 
>2.1.1
>

Actions: View | Splinter Review

Attachments on bug 27068: 34032 | 107770 | 107868 | 110854

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.