Attachment 113166 Details for Bug 88971 – Patches to add -preservecolorspace

[patch] Patches to add -preservecolorspace

poppler-git-4feb15-preservecolorspace.patch (text/plain), 4.38 KB, created by William Bader on 2015-02-04 18:21:08 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: William Bader

Created: 2015-02-04 18:21:08 UTC

Size: 4.38 KB

patch

obsolete

> poppler/PSOutputDev.cc | 24 +++++++++++++++---------
> poppler/PSOutputDev.h  |  4 ++++
> utils/pdftops.cc       |  4 ++++
> 3 files changed, 23 insertions(+), 9 deletions(-)
>
>diff --git a/poppler/PSOutputDev.cc b/poppler/PSOutputDev.cc
>index f69eb86..e1de3cb 100644
>--- a/poppler/PSOutputDev.cc
>+++ b/poppler/PSOutputDev.cc
>@@ -3312,16 +3312,20 @@ GBool PSOutputDev::checkPageSlice(Page *page, double /*hDPI*/, double /*vDPI*/,
>     case psLevel1Sep:
>       p = bitmap->getDataPtr();
>       // Check for an all gray image
>-      isGray = gTrue;
>-      for (y = 0; y < h; ++y) {
>-	for (x = 0; x < w; ++x) {
>-	  if (p[4*x] != p[4*x + 1] || p[4*x] != p[4*x + 2]) {
>-	    isGray = gFalse;
>-	    y = h;
>-	    break;
>+      if (getPreserveColorSpace()) {
>+	isGray = gFalse;
>+      } else {
>+        isGray = gTrue;
>+        for (y = 0; y < h; ++y) {
>+	  for (x = 0; x < w; ++x) {
>+	    if (p[4*x] != p[4*x + 1] || p[4*x] != p[4*x + 2]) {
>+	      isGray = gFalse;
>+	      y = h;
>+	      break;
>+	    }
> 	  }
>+	  p += bitmap->getRowSize();
> 	}
>-	p += bitmap->getRowSize();
>       }
>       writePSFmt("{0:d} {1:d} 8 [{2:d} 0 0 {3:d} 0 {4:d}] pdfIm1{5:s}{6:s}\n",
> 		 w, h, w, -h, h,
>@@ -3468,7 +3472,9 @@ GBool PSOutputDev::checkPageSlice(Page *page, double /*hDPI*/, double /*vDPI*/,
>       p = bitmap->getDataPtr() + (h - 1) * bitmap->getRowSize();
>       str0 = new MemStream((char *)p, 0, w * h * numComps, &obj);
>       // Check for a color image that uses only gray
>-      if (numComps == 4) {
>+      if (getPreserveColorSpace()) {
>+	isGray = gFalse;
>+      } else if (numComps == 4) {
>         int compCyan;
>         isGray = gTrue;
>         while ((compCyan = str0->getChar()) != EOF) {
>diff --git a/poppler/PSOutputDev.h b/poppler/PSOutputDev.h
>index 128ff7c..aaa49de 100644
>--- a/poppler/PSOutputDev.h
>+++ b/poppler/PSOutputDev.h
>@@ -319,12 +319,14 @@ public:
>   GBool getEmbedCIDPostScript() const { return embedCIDPostScript; }
>   GBool getEmbedCIDTrueType() const { return embedCIDTrueType; }
>   GBool getFontPassthrough() const { return fontPassthrough; }
>+  GBool getPreserveColorSpace() const { return preserveColorSpace; }
>   void setEmbedType1(GBool b) { embedType1 = b; }
>   void setEmbedTrueType(GBool b) { embedTrueType = b; }
>   void setEmbedCIDPostScript(GBool b) { embedCIDPostScript = b; }
>   void setEmbedCIDTrueType(GBool b) { embedCIDTrueType = b; }
>   void setFontPassthrough(GBool b) { fontPassthrough = b; }
>   void setPreloadImagesForms(GBool b) { preloadImagesForms = b; }
>+  void setPreserveColorSpace(GBool b) { preserveColorSpace = b; }
>   void setGenerateOPI(GBool b) { generateOPI = b; }
>   void setUseASCIIHex(GBool b) { useASCIIHex = b; }
>   void setUseBinary(GBool b) { useBinary = b; }
>@@ -520,6 +522,8 @@ private:
>   GBool fontPassthrough;	// pass all fonts through as-is?
>   GBool preloadImagesForms;	// preload PostScript images and forms into
> 				//   memory
>+  GBool preserveColorSpace;	// true to keep gray RGB images in their original color space
>+				// false to optimize gray images to DeviceGray color space
>   GBool generateOPI;		// generate PostScript OPI comments?
>   GBool useASCIIHex;		// use ASCIIHex instead of ASCII85?
>   GBool useBinary;		// use binary instead of hex
>diff --git a/utils/pdftops.cc b/utils/pdftops.cc
>index b85d96e..6205b04 100644
>--- a/utils/pdftops.cc
>+++ b/utils/pdftops.cc
>@@ -95,6 +95,7 @@ static GBool noEmbedTTFonts = gFalse;
> static GBool noEmbedCIDPSFonts = gFalse;
> static GBool noEmbedCIDTTFonts = gFalse;
> static GBool fontPassthrough = gFalse;
>+static GBool preserveColorSpace = gFalse;
> static char rasterAntialiasStr[16] = "";
> static GBool preload = gFalse;
> static char paperSize[15] = "";
>@@ -155,6 +156,8 @@ static const ArgDesc argDesc[] = {
>    "don't embed CID TrueType fonts"},
>   {"-passfonts",  argFlag,        &fontPassthrough,0,
>    "don't substitute missing fonts"},
>+  {"-preservecolorspace",  argFlag,        &preserveColorSpace,0,
>+   "don't convert gray RGB images to gray color space"},
>   {"-aaRaster",   argString,   rasterAntialiasStr, sizeof(rasterAntialiasStr),
>    "enable anti-aliasing on rasterization: yes, no"},
>   {"-preload",    argFlag,     &preload,        0,
>@@ -403,6 +406,7 @@ int main(int argc, char *argv[]) {
>   psOut->setEmbedCIDTrueType(!noEmbedCIDTTFonts);
>   psOut->setFontPassthrough(fontPassthrough);
>   psOut->setPreloadImagesForms(preload);
>+  psOut->setPreserveColorSpace(preserveColorSpace);
> #if OPI_SUPPORT
>   psOut->setGenerateOPI(doOPI);
> #endif

Actions: View | Splinter Review

Attachments on bug 88971: 113166 | 113199 | 113200 | 113201 | 113208 | 113211 | 113213

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.