Attachment 116004 Details for Bug 90570 – patch to fix the problem

[patch] patch to fix the problem

poppler-pdftoppm-fix-24may15.pat (text/plain), 2.42 KB, created by William Bader on 2015-05-24 10:16:52 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: William Bader

Created: 2015-05-24 10:16:52 UTC

Size: 2.42 KB

patch

obsolete

> poppler/SplashOutputDev.cc | 52 +++++++++++++++++++++++++++++++++++++++++++++++++++-
> 1 file changed, 51 insertions(+), 1 deletion(-)
>
>diff --git a/poppler/SplashOutputDev.cc b/poppler/SplashOutputDev.cc
>index a7cc6bc..cf0d5b3 100644
>--- a/poppler/SplashOutputDev.cc
>+++ b/poppler/SplashOutputDev.cc
>@@ -141,6 +141,56 @@ static inline void convertGfxColor(SplashColorPtr dest,
>   splashColorCopy(dest, color);
> }
> 
>+// Copy a color according to the color mode.
>+// Use convertGfxShortColor() below when the destination is a bitmap
>+// to avoid overwriting cells.
>+// Calling this in SplashGouraudPattern::getParameterizedColor() fixes bug 90570.
>+// Use convertGfxColor() above when the destination is an array of SPOT_NCOMPS+4 bytes,
>+// to ensure that everything is initialized.
>+
>+static inline void convertGfxShortColor(SplashColorPtr dest,
>+                                   SplashColorMode colorMode,
>+                                   GfxColorSpace *colorSpace,
>+                                   GfxColor *src) {
>+  GfxGray gray;
>+  GfxRGB rgb;
>+#if SPLASH_CMYK
>+  GfxCMYK cmyk;
>+  GfxColor deviceN;
>+#endif
>+
>+  switch (colorMode) {
>+    case splashModeMono1:
>+    case splashModeMono8:
>+      colorSpace->getGray(src, &gray);
>+      dest[0] = colToByte(gray);
>+    break;
>+    case splashModeXBGR8:
>+      dest[3] = 255;
>+    case splashModeBGR8:
>+    case splashModeRGB8:
>+      colorSpace->getRGB(src, &rgb);
>+      dest[0] = colToByte(rgb.r);
>+      dest[1] = colToByte(rgb.g);
>+      dest[2] = colToByte(rgb.b);
>+    break;
>+#if SPLASH_CMYK
>+    case splashModeCMYK8:
>+      colorSpace->getCMYK(src, &cmyk);
>+      dest[0] = colToByte(cmyk.c);
>+      dest[1] = colToByte(cmyk.m);
>+      dest[2] = colToByte(cmyk.y);
>+      dest[3] = colToByte(cmyk.k);
>+    break;
>+    case splashModeDeviceN8:
>+      colorSpace->getDeviceN(src, &deviceN);
>+      for (int i = 0; i < SPOT_NCOMPS + 4; i++)
>+        dest[i] = colToByte(deviceN.c[i]);
>+    break;
>+#endif
>+  }
>+}
>+
> //------------------------------------------------------------------------
> // SplashGouraudPattern
> //------------------------------------------------------------------------
>@@ -177,7 +227,7 @@ void SplashGouraudPattern::getParameterizedColor(double colorinterp, SplashColor
>     for (int m = 0; m < colorComps; ++m)
>       dest[m] = colToByte(src.c[m]);
>   } else {
>-    convertGfxColor(dest, mode, srcColorSpace, &src);
>+    convertGfxShortColor(dest, mode, srcColorSpace, &src);
>   }
> }
>

Actions: View | Splinter Review

Attachments on bug 90570: 115960 | 115961 | 116004

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.