Attachment 126845 Details for Bug 97803 – read softmask into memstrean in case of matte

[patch] read softmask into memstrean in case of matte

usememstream.patch (text/plain), 1.57 KB, created by Thomas Freitag on 2016-09-29 07:38:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Thomas Freitag

Created: 2016-09-29 07:38:00 UTC

Size: 1.57 KB

patch

obsolete

>diff --git a/poppler/SplashOutputDev.cc b/poppler/SplashOutputDev.cc
>index 688540b..139460f 100644
>--- a/poppler/SplashOutputDev.cc
>+++ b/poppler/SplashOutputDev.cc
>@@ -3997,6 +3997,16 @@ void SplashOutputDev::drawSoftMaskedImage(GfxState *state, Object *ref,
> 
>   //----- set up the soft mask
> 
>+  if (maskColorMap->getMatteColor() != NULL) {
>+    Guchar *data = (Guchar *) gmalloc(maskWidth * maskHeight);
>+    maskStr->reset();
>+    maskStr->doGetChars(maskWidth * maskHeight, data);
>+    maskStr->close();
>+    Object *maskDict = new Object();
>+    maskDict->initDict(maskStr->getDict());
>+    maskStr = new MemStream((char *)data, 0, maskWidth * maskHeight, maskDict);
>+    ((MemStream *) maskStr)->setNeedFree(gTrue);
>+  }
>   imgMaskData.imgStr = new ImageStream(maskStr, maskWidth,
> 				       maskColorMap->getNumPixelComps(),
> 				       maskColorMap->getBits());
>@@ -4024,6 +4034,9 @@ void SplashOutputDev::drawSoftMaskedImage(GfxState *state, Object *ref,
>   maskSplash->drawImage(&imageSrc, NULL, &imgMaskData, splashModeMono8, gFalse,
> 			maskWidth, maskHeight, mat, maskInterpolate);
>   delete imgMaskData.imgStr;
>+  if (maskColorMap->getMatteColor() == NULL) {
>+    maskStr->close();
>+  }
>   gfree(imgMaskData.lookup);
>   delete maskSplash;
>   splash->setSoftMask(maskBitmap);
>@@ -4123,7 +4136,10 @@ void SplashOutputDev::drawSoftMaskedImage(GfxState *state, Object *ref,
>   gfree(imgData.lookup);
>   delete imgData.maskStr;
>   delete imgData.imgStr;
>-  maskStr->close();
>+  if (maskColorMap->getMatteColor() != NULL) {
>+    maskStr->close();
>+    delete maskStr;
>+  }
>   str->close();
> }
>

Actions: View | Splinter Review

Attachments on bug 97803: 126512 | 126600 | 126845

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.