Attachment 125490 Details for Bug 97193 – patch to add -passlevel1customcolor

[patch] patch to add -passlevel1customcolor

poppler-0.46.0-sep-20160802-125134.pat (text/plain), 6.25 KB, created by William Bader on 2016-08-02 19:21:38 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: William Bader

Created: 2016-08-02 19:21:38 UTC

Size: 6.25 KB

patch

obsolete

>--- poppler-0.46.0-sep/poppler/PSOutputDev.cc-	2016-05-31 11:40:39.000000000 -0500
>+++ poppler-0.46.0-sep/poppler/PSOutputDev.cc	2016-08-02 12:49:21.247663323 -0500
>@@ -1245,6 +1245,7 @@
>   embedCIDTrueType = gTrue;
>   fontPassthrough = gFalse;
>   optimizeColorSpace = gFalse;
>+  passLevel1CustomColor = gFalse;
>   preloadImagesForms = gFalse;
>   generateOPI = gFalse;
>   useASCIIHex = gFalse;
>@@ -1647,6 +1648,7 @@
>       }
>     } else if ((level == psLevel1 && lev1 && nonSep) ||
> 	       (level == psLevel1Sep && lev1 && sep) ||
>+	       (level == psLevel1Sep && lev2 && sep && getPassLevel1CustomColor()) ||
> 	       (level == psLevel2 && lev2 && nonSep) ||
> 	       (level == psLevel2Sep && lev2 && sep) ||
> 	       (level == psLevel3 && lev3 && nonSep) ||
>@@ -4117,15 +4119,6 @@
>     state->getFillGray(&gray);
>     writePSFmt("{0:.4g} g\n", colToDbl(gray));
>     break;
>-  case psLevel1Sep:
>-    state->getFillCMYK(&cmyk);
>-    c = colToDbl(cmyk.c);
>-    m = colToDbl(cmyk.m);
>-    y = colToDbl(cmyk.y);
>-    k = colToDbl(cmyk.k);
>-    writePSFmt("{0:.4g} {1:.4g} {2:.4g} {3:.4g} k\n", c, m, y, k);
>-    addProcessColor(c, m, y, k);
>-    break;
>   case psLevel2:
>   case psLevel3:
>     if (state->getFillColorSpace()->getMode() != csPattern) {
>@@ -4140,9 +4133,10 @@
>       writePS("] sc\n");
>     }
>     break;
>+  case psLevel1Sep:
>   case psLevel2Sep:
>   case psLevel3Sep:
>-    if (state->getFillColorSpace()->getMode() == csSeparation) {
>+    if (state->getFillColorSpace()->getMode() == csSeparation && (level > psLevel1Sep || getPassLevel1CustomColor())) {
>       sepCS = (GfxSeparationColorSpace *)state->getFillColorSpace();
>       color.c[0] = gfxColorComp1;
>       sepCS->getCMYK(&color, &cmyk);
>@@ -4183,15 +4177,6 @@
>     state->getStrokeGray(&gray);
>     writePSFmt("{0:.4g} G\n", colToDbl(gray));
>     break;
>-  case psLevel1Sep:
>-    state->getStrokeCMYK(&cmyk);
>-    c = colToDbl(cmyk.c);
>-    m = colToDbl(cmyk.m);
>-    y = colToDbl(cmyk.y);
>-    k = colToDbl(cmyk.k);
>-    writePSFmt("{0:.4g} {1:.4g} {2:.4g} {3:.4g} K\n", c, m, y, k);
>-    addProcessColor(c, m, y, k);
>-    break;
>   case psLevel2:
>   case psLevel3:
>     if (state->getStrokeColorSpace()->getMode() != csPattern) {
>@@ -4206,9 +4191,10 @@
>       writePS("] SC\n");
>     }
>     break;
>+  case psLevel1Sep:
>   case psLevel2Sep:
>   case psLevel3Sep:
>-    if (state->getStrokeColorSpace()->getMode() == csSeparation) {
>+    if (state->getStrokeColorSpace()->getMode() == csSeparation && (level > psLevel1Sep || getPassLevel1CustomColor())) {
>       sepCS = (GfxSeparationColorSpace *)state->getStrokeColorSpace();
>       color.c[0] = gfxColorComp1;
>       sepCS->getCMYK(&color, &cmyk);
>@@ -5882,7 +5868,11 @@
> 
>   // color space
>   if (colorMap) {
>-    dumpColorSpaceL2(colorMap->getColorSpace(), gFalse, gTrue, gFalse);
>+    // Do not update the process color list for custom colors
>+    GBool isCustomColor =
>+      (level == psLevel1Sep || level == psLevel2Sep || level == psLevel3Sep) &&
>+      colorMap->getColorSpace()->getMode() == csDeviceN;
>+    dumpColorSpaceL2(colorMap->getColorSpace(), gFalse, !isCustomColor, gFalse);
>     writePS(" setcolorspace\n");
>   }
> 
>@@ -6281,7 +6271,11 @@
> 
>   // color space
>   if (colorMap) {
>-    dumpColorSpaceL2(colorMap->getColorSpace(), gFalse, gTrue, gFalse);
>+    // Do not update the process color list for custom colors
>+    GBool isCustomColor =
>+      (level == psLevel1Sep || level == psLevel2Sep || level == psLevel3Sep) &&
>+      colorMap->getColorSpace()->getMode() == csDeviceN;
>+    dumpColorSpaceL2(colorMap->getColorSpace(), gFalse, !isCustomColor, gFalse);
>     writePS(" setcolorspace\n");
>   }
> 
>--- poppler-0.46.0-sep/poppler/PSOutputDev.h-	2016-05-01 17:08:03.000000000 -0500
>+++ poppler-0.46.0-sep/poppler/PSOutputDev.h	2016-08-01 14:20:49.412864971 -0500
>@@ -320,6 +320,7 @@
>   GBool getEmbedCIDTrueType() const { return embedCIDTrueType; }
>   GBool getFontPassthrough() const { return fontPassthrough; }
>   GBool getOptimizeColorSpace() const { return optimizeColorSpace; }
>+  GBool getPassLevel1CustomColor() const { return passLevel1CustomColor; }
>   GBool getEnableLZW() const { return enableLZW; };
>   GBool getEnableFlate() const
> #if ENABLE_ZLIB
>@@ -333,6 +334,7 @@
>   void setEmbedCIDTrueType(GBool b) { embedCIDTrueType = b; }
>   void setFontPassthrough(GBool b) { fontPassthrough = b; }
>   void setOptimizeColorSpace(GBool b) { optimizeColorSpace = b; }
>+  void setPassLevel1CustomColor(GBool b) { passLevel1CustomColor = b; }
>   void setPreloadImagesForms(GBool b) { preloadImagesForms = b; }
>   void setGenerateOPI(GBool b) { generateOPI = b; }
>   void setUseASCIIHex(GBool b) { useASCIIHex = b; }
>@@ -536,6 +538,9 @@
>   GBool fontPassthrough;	// pass all fonts through as-is?
>   GBool optimizeColorSpace;	// false to keep gray RGB images in their original color space
> 				// true to optimize gray images to DeviceGray color space
>+  GBool passLevel1CustomColor;	// false to convert all custom colors to CMYK
>+				// true to pass custom colors
>+				// has effect only when doing a level1sep
>   GBool preloadImagesForms;	// preload PostScript images and forms into
> 				//   memory
>   GBool generateOPI;		// generate PostScript OPI comments?
>--- poppler-0.46.0-sep/utils/pdftops.cc-	2016-05-01 17:08:04.000000000 -0500
>+++ poppler-0.46.0-sep/utils/pdftops.cc	2016-08-01 18:17:34.153444490 -0500
>@@ -96,6 +96,7 @@
> static GBool noEmbedCIDTTFonts = gFalse;
> static GBool fontPassthrough = gFalse;
> static GBool optimizeColorSpace = gFalse;
>+static GBool passLevel1CustomColor = gFalse;
> static char rasterAntialiasStr[16] = "";
> static GBool preload = gFalse;
> static char paperSize[15] = "";
>@@ -160,6 +161,8 @@
>    "enable anti-aliasing on rasterization: yes, no"},
>   {"-optimizecolorspace",  argFlag,        &optimizeColorSpace,0,
>    "convert gray RGB images to gray color space"},
>+  {"-passlevel1customcolor", argFlag,      &passLevel1CustomColor, 0,
>+   "pass custom color in level1sep"},
>   {"-preload",    argFlag,     &preload,        0,
>    "preload images and forms"},
>   {"-paper",      argString,   paperSize,       sizeof(paperSize),
>@@ -407,6 +410,7 @@
>   psOut->setFontPassthrough(fontPassthrough);
>   psOut->setPreloadImagesForms(preload);
>   psOut->setOptimizeColorSpace(optimizeColorSpace);
>+  psOut->setPassLevel1CustomColor(passLevel1CustomColor);
> #if OPI_SUPPORT
>   psOut->setGenerateOPI(doOPI);
> #endif

Actions: View | Splinter Review

Attachments on bug 97193: 125490 | 125491

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.