[poppler] 2 commits - poppler/SplashOutputDev.cc

[Albert Astals Cid]

 poppler/SplashOutputDev.cc |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

New commits:
commit fd648e83e60db7157b7273ffddc02308b0c5813b
Merge: 970e9f6 53b9cec
Author: Albert Astals Cid <aacid at kde.org>
Date:   Sun Apr 21 23:30:16 2013 +0200

    Merge remote-tracking branch 'origin/poppler-0.22'

commit 53b9cec6c1334020f90b885cff6fc30293437e5f
Author: Thomas Freitag <Thomas.Freitag at alfa.de>
Date:   Sun Apr 21 23:28:40 2013 +0200

    Splash: Always consider a softmask transfer function
    
    Fixes bug 63587 in splash

diff --git a/poppler/SplashOutputDev.cc b/poppler/SplashOutputDev.cc
index 0426b18..6e62720 100644
--- a/poppler/SplashOutputDev.cc
+++ b/poppler/SplashOutputDev.cc
@@ -3975,7 +3975,12 @@ void SplashOutputDev::setSoftMask(GfxState *state, double *bbox,
   for (y = 0; y < yMax; ++y) {
     for (x = 0; x < xMax; ++x) {
       if (alpha) {
-	p[x] = tBitmap->getAlpha(x, y);
+	if (transferFunc) {
+	  lum = tBitmap->getAlpha(x, y) / 255.0;
+	  transferFunc->transform(&lum, &lum2);
+	  p[x] = (int)(lum2 * 255.0 + 0.5);
+	} else 
+	  p[x] = tBitmap->getAlpha(x, y);
       } else {
 	  tBitmap->getPixel(x, y, color);
 	  // convert to luminosity