Attachment 75727 Details for Bug 61413 – tiling pattern fix

[patch] tiling pattern fix

removeit.diff (text/plain), 1.65 KB, created by Thomas Freitag on 2013-03-01 08:51:28 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Thomas Freitag

Created: 2013-03-01 08:51:28 UTC

Size: 1.65 KB

patch

obsolete

>diff --git a/poppler/SplashOutputDev.cc b/poppler/SplashOutputDev.cc
>index c03b2f9..5f84f2c 100644
>--- a/poppler/SplashOutputDev.cc
>+++ b/poppler/SplashOutputDev.cc
>@@ -4121,8 +4121,10 @@ GBool SplashOutputDev::tilingPatternFill(GfxState *state, Gfx *gfxA, Catalog *ca
>   state->concatCTM(1, 0, 0, 1, bbox[0], bbox[1]);
>   ctm = state->getCTM();
>   for (i = 0; i < 6; ++i) {
>-    if (!isfinite(ctm[i]))
>+    if (!isfinite(ctm[i])) {
>+      state->setCTM(savedCTM[0], savedCTM[1], savedCTM[2], savedCTM[3], savedCTM[4], savedCTM[5]);
>       return gFalse;
>+    }
>   }
>   matc[4] = x0 * xStep * ctm[0] + y0 * yStep * ctm[2] + ctm[4];
>   matc[5] = x0 * xStep * ctm[1] + y0 * yStep * ctm[3] + ctm[5];
>@@ -4164,8 +4166,10 @@ GBool SplashOutputDev::tilingPatternFill(GfxState *state, Gfx *gfxA, Catalog *ca
>     repeatX = x1 - x0;
>     repeatY = y1 - y0;
>   } else {
>-    if ((unsigned long) result_width * result_height > 0x800000L)
>+    if ((unsigned long) result_width * result_height > 0x800000L) {
>+      state->setCTM(savedCTM[0], savedCTM[1], savedCTM[2], savedCTM[3], savedCTM[4], savedCTM[5]);
>       return gFalse;
>+    }
>     while(fabs(kx) > 16384 || fabs(ky) > 16384) {
>       // limit pattern bitmap size
>       m1.m[0] /= 2;
>@@ -4196,8 +4200,10 @@ GBool SplashOutputDev::tilingPatternFill(GfxState *state, Gfx *gfxA, Catalog *ca
>   matc[2] = ctm[2];
>   matc[3] = ctm[3];
> 
>-  if (surface_width == 0 || surface_height == 0)
>+  if (surface_width == 0 || surface_height == 0) {
>+    state->setCTM(savedCTM[0], savedCTM[1], savedCTM[2], savedCTM[3], savedCTM[4], savedCTM[5]);
>     return gFalse;
>+  }
>   m1.transform(bbox[0], bbox[1], &kx, &ky);
>   m1.m[4] = -kx;
>   m1.m[5] = -ky;

Actions: View | Splinter Review

Attachments on bug 61413: 75462 | 75463 | 75569 | 75727

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.