Attachment 48826 Details for Bug 37688 – patch to make -level1sep write gray instead of cmyk

[patch] patch to make -level1sep write gray instead of cmyk

poppler-git-07jul11-level1sepgray.pat (text/plain), 2.43 KB, created by William Bader on 2011-07-06 11:33:57 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: William Bader

Created: 2011-07-06 11:33:57 UTC

Size: 2.43 KB

patch

obsolete

>--- poppler-git-07jul11-level1sepgray/poppler/PSOutputDev.cc-	2011-07-06 19:43:27.822176430 +0200
>+++ poppler-git-07jul11-level1sepgray/poppler/PSOutputDev.cc	2011-07-06 20:23:28.793123095 +0200
>@@ -506,7 +506,6 @@
>   "         /pdfTextClipPath [] def } def",
>   "~1ns",
>   "% Level 1 image operators",
>-  "~1n",
>   "/pdfIm1 {",
>   "  /pdfImBuf1 4 index string def",
>   "  { currentfile pdfImBuf1 readhexstring pop } image",
>@@ -3141,13 +3140,71 @@
>     break;
>   case psLevel1Sep:
>     useBinary = globalParams->getPSBinary();
>-    writePSFmt("{0:d} {1:d} 8 [{2:d} 0 0 {3:d} 0 {4:d}] pdfIm1Sep{5:s}\n",
>+    p = bitmap->getDataPtr();
>+    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();
>+    }
>+    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,
>+	       isGray ? "" : "Sep",
> 	       useBinary ? "Bin" : "");
>     p = bitmap->getDataPtr();
>     i = 0;
>     col[0] = col[1] = col[2] = col[3] = 0;
>-    if (((psProcessCyan | psProcessMagenta | psProcessYellow | psProcessBlack) & ~processColors) != 0) {
>+    if (isGray) {
>+      int g;
>+      if ((psProcessBlack & processColors) == 0) {
>+	for (y = 0; y < h; ++y) {
>+	  for (x = 0; x < w; ++x) {
>+	    if (p[4*x] > 0 || p[4*x + 3] > 0) {
>+	      col[3] = 1;
>+	      y = h;
>+	      break;
>+	    }
>+	  }
>+          p += bitmap->getRowSize();
>+	}
>+        p = bitmap->getDataPtr();
>+      }
>+      for (y = 0; y < h; ++y) {
>+	if (useBinary) {
>+	  for (x = 0; x < w; ++x) {
>+	    g = p[4*x] + p[4*x + 3];
>+	    g = 255 - g;
>+	    if (g < 0) g = 0;
>+	    hexBuf[i++] = (Guchar) g;
>+	    if (i >= 64) {
>+	      writePSBuf(hexBuf, i);
>+	      i = 0;
>+	    }
>+	  }
>+	} else {
>+	  for (x = 0; x < w; ++x) {
>+	    g = p[4*x] + p[4*x + 3];
>+	    g = 255 - g;
>+	    if (g < 0) g = 0;
>+	    digit = g / 16;
>+	    hexBuf[i++] = digit + ((digit >= 10)? 'a' - 10: '0');
>+	    digit = g % 16;
>+	    hexBuf[i++] = digit + ((digit >= 10)? 'a' - 10: '0');
>+	    if (i >= 64) {
>+	      hexBuf[i++] = '\n';
>+	      writePSBuf(hexBuf, i);
>+	      i = 0;
>+	    }
>+	  }
>+        }
>+        p += bitmap->getRowSize();
>+      }
>+    } else if (((psProcessCyan | psProcessMagenta | psProcessYellow | psProcessBlack) & ~processColors) != 0) {
>       for (y = 0; y < h; ++y) {
>         for (comp = 0; comp < 4; ++comp) {
> 	  if (useBinary) {

Actions: View | Splinter Review

Attachments on bug 37688: 47248 | 47292 | 47320 | 47322 | 48796 | 48826

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.