Attachment 63925 Details for Bug 51822 – Solves the lab problem with indexed deviceN images

[patch] Solves the lab problem with indexed deviceN images

labdeviceN.patch (text/plain), 4.78 KB, created by Thomas Freitag on 2012-07-07 01:52:26 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Thomas Freitag

Created: 2012-07-07 01:52:26 UTC

Size: 4.78 KB

patch

obsolete

>diff --git a/poppler/PSOutputDev.cc b/poppler/PSOutputDev.cc
>index 5df506f..e806fdb 100644
>--- a/poppler/PSOutputDev.cc
>+++ b/poppler/PSOutputDev.cc
>@@ -6369,13 +6369,13 @@ void PSOutputDev::dumpColorSpaceL2(GfxColorSpace *colorSpace,
>   case csLab:
>     labCS = (GfxLabColorSpace *)colorSpace;
>     writePS("[/CIEBasedABC <<\n");
>-    if (map01) {
>+    if (map01 && level != psLevel3 && level != psLevel3Sep) {
>       writePS(" /RangeABC [0 1 0 1 0 1]\n");
>       writePSFmt(" /DecodeABC [{{100 mul 16 add 116 div}} bind {{{0:.4g} mul {1:.4g} add}} bind {{{2:.4g} mul {3:.4g} add}} bind]\n",
>-		 (labCS->getAMax() - labCS->getAMin()) / 500.0,
>-		 labCS->getAMin() / 500.0,
>-		 (labCS->getBMax() - labCS->getBMin()) / 200.0,
>-		 labCS->getBMin() / 200.0);
>+        (labCS->getAMax() - labCS->getAMin()) / 500.0,
>+        labCS->getAMin() / 500.0,
>+        (labCS->getBMax() - labCS->getBMin()) / 200.0,
>+        labCS->getBMin() / 200.0);
>     } else {
>       writePSFmt(" /RangeABC [0 100 {0:.4g} {1:.4g} {2:.4g} {3:.4g}]\n",
> 		 labCS->getAMin(), labCS->getAMax(),
>@@ -6516,7 +6516,7 @@ void PSOutputDev::dumpColorSpaceL2(GfxColorSpace *colorSpace,
>       writePS("]\n");
>       dumpColorSpaceL2(deviceNCS->getAlt(), gFalse, updateColors, map01);
>       writePS("\n");
>-      cvtFunction(deviceNCS->getTintTransformFunc());
>+      cvtFunction(deviceNCS->getTintTransformFunc(), map01 && deviceNCS->getAlt()->getMode() == csLab);
>       writePS("]\n");
>       if (genXform) {
>         writePS(" {}");
>@@ -6979,7 +6979,7 @@ void PSOutputDev::psXObject(Stream *psStream, Stream *level1Stream) {
> 
> //~ can nextFunc be reset to 0 -- maybe at the start of each page?
> //~   or maybe at the start of each color space / pattern?
>-void PSOutputDev::cvtFunction(Function *func) {
>+void PSOutputDev::cvtFunction(Function *func, GBool invertPSFunction) {
>   SampledFunction *func0;
>   ExponentialFunction *func2;
>   StitchingFunction *func3;
>@@ -7069,7 +7069,14 @@ void PSOutputDev::cvtFunction(Function *func) {
>       // [e01] [efrac] y(0) ... y(i-1) y(i)
>     }
>     // [e01] [efrac] y(0) ... y(n-1)
>-    writePSFmt("{0:d} {1:d} roll pop pop }}\n", n+2, n);
>+    writePSFmt("{0:d} {1:d} roll pop pop \n", n+2, n);
>+    if (invertPSFunction) {
>+      for (i = 0; i < n; ++i) {
>+        writePSFmt("{0:d} -1 roll ", n);
>+        writePSFmt("{0:.6g} sub {1:.6g} div ", func0->getRangeMin(i), func0->getRangeMax(i) - func0->getRangeMin(i));
>+      }
>+    }
>+    writePS("}\n");
>     break;
> 
>   case 2:			// exponential
>@@ -7091,7 +7098,14 @@ void PSOutputDev::cvtFunction(Function *func) {
>       }
>     }
>     // x y(0) .. y(n-1)
>-    writePSFmt("{0:d} {1:d} roll pop }}\n", n+1, n);
>+    writePSFmt("{0:d} {1:d} roll pop \n", n+1, n);
>+    if (invertPSFunction && func2->getHasRange()) {
>+      for (i = 0; i < n; ++i) {
>+        writePSFmt("{0:d} -1 roll ", n);
>+        writePSFmt("{0:.6g} sub {1:.6g} div ", func2->getRangeMin(i), func2->getRangeMax(i) - func2->getRangeMin(i));
>+      }
>+    }
>+    writePS("}\n");
>     break;
> 
>   case 3:			// stitching
>@@ -7120,13 +7134,39 @@ void PSOutputDev::cvtFunction(Function *func) {
>     for (i = 0; i < func3->getNumFuncs() - 1; ++i) {
>       writePS("} ifelse\n");
>     }
>+    if (invertPSFunction && func3->getHasRange()) {
>+      n = func3->getOutputSize();
>+      for (i = 0; i < n; ++i) {
>+        writePSFmt("{0:d} -1 roll ", n);
>+        writePSFmt("{0:.6g} sub {1:.6g} div ", func3->getRangeMin(i), func3->getRangeMax(i) - func3->getRangeMin(i));
>+      }
>+    }
>     writePS("}\n");
>     break;
> 
>   case 4:			// PostScript
>     func4 = (PostScriptFunction *)func;
>-    writePS(func4->getCodeString()->getCString());
>-    writePS("\n");
>+    if (invertPSFunction) {
>+      GooString *codeString = new GooString(func4->getCodeString());
>+      for (i = codeString->getLength() -1; i > 0; i--) {
>+        if (codeString->getChar(i) == '}') {
>+          codeString->del(i);
>+          break;
>+        }
>+      }
>+      writePS(codeString->getCString());
>+      writePS("\n");
>+      delete codeString;
>+      n = func4->getOutputSize();
>+      for (i = 0; i < n; ++i) {
>+        writePSFmt("{0:d} -1 roll ", n);
>+        writePSFmt("{0:.6g} sub {1:.6g} div ", func4->getRangeMin(i), func4->getRangeMax(i) - func4->getRangeMin(i));
>+      }
>+      writePS("}\n");
>+    } else {
>+      writePS(func4->getCodeString()->getCString());
>+      writePS("\n");
>+    }
>     break;
>   }
> }
>diff --git a/poppler/PSOutputDev.h b/poppler/PSOutputDev.h
>index 70aef9f..809f058 100644
>--- a/poppler/PSOutputDev.h
>+++ b/poppler/PSOutputDev.h
>@@ -378,7 +378,7 @@ private:
>   void opiTransform(GfxState *state, double x0, double y0,
> 		    double *x1, double *y1);
> #endif
>-  void cvtFunction(Function *func);
>+  void cvtFunction(Function *func, GBool invertPSFunction = gFalse);
>   GooString *filterPSName(GooString *name);
> 
>   // Write the document-level setup.

Actions: View | Splinter Review

Attachments on bug 51822: 63925 | 64183

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.