Attachment 94547 Details for Bug 75241 – proposed patch to poppler/PreScanOutputDev to fix the problem

[patch] proposed patch to poppler/PreScanOutputDev to fix the problem

poppler-image-21feb14.pat (text/plain), 1.63 KB, created by William Bader on 2014-02-22 03:24:55 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: William Bader

Created: 2014-02-22 03:24:55 UTC

Size: 1.63 KB

patch

obsolete

>--- poppler-git-19feb14/poppler/PreScanOutputDev.cc-	2014-02-19 17:02:18.000000000 -0500
>+++ poppler-git-19feb14/poppler/PreScanOutputDev.cc	2014-02-21 18:18:04.268526608 -0500
>@@ -87,7 +87,14 @@
> 					int x0, int y0, int x1, int y1,
> 					double xStep, double yStep) {
>   if (paintType == 1) {
>+    GBool tilingNeeded = (x1 - x0 != 1 || y1 - y0 != 1);
>+    if (tilingNeeded) {
>+        inTilingPatternFill++;
>+    }
>     gfx->drawForm(str, resDict, mat, bbox);
>+    if (tilingNeeded) {
>+        inTilingPatternFill--;
>+    }
>   } else {
>     check(state->getFillColorSpace(), state->getFillColor(),
> 	  state->getFillOpacity(), state->getBlendMode());
>@@ -200,7 +207,7 @@
> 	state->getFillOpacity(), state->getBlendMode());
>   gdi = gFalse;
>   if ((level == psLevel1 || level == psLevel1Sep) &&
>-      state->getFillColorSpace()->getMode() == csPattern) {
>+      (state->getFillColorSpace()->getMode() == csPattern || inTilingPatternFill > 0)) {
>     patternImgMask = gTrue;
>   }
> 
>@@ -238,6 +245,10 @@
>     transparency = gTrue;
>   }
>   gdi = gFalse;
>+  if ((level == psLevel1 || level == psLevel1Sep) &&
>+      inTilingPatternFill > 0) {
>+    patternImgMask = gTrue;
>+  }
> 
>   if (inlineImg) {
>     str->reset();
>@@ -354,4 +365,5 @@
>   transparency = gFalse;
>   gdi = gTrue;
>   patternImgMask = gFalse;
>+  inTilingPatternFill = 0;
> }
>--- poppler-git-19feb14/poppler/PreScanOutputDev.h-	2014-02-19 17:02:18.000000000 -0500
>+++ poppler-git-19feb14/poppler/PreScanOutputDev.h	2014-02-21 19:54:01.473018554 -0500
>@@ -176,6 +176,7 @@
>   GBool gdi;
>   PSLevel level;		// PostScript level (1, 2, separation)
>   GBool patternImgMask;		
>+  int inTilingPatternFill;
> };
> 
> #endif

Actions: View | Splinter Review

Attachments on bug 75241: 94547

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.