[poppler] 2 commits - utils/ImageOutputDev.cc

[Albert Astals Cid]

 utils/ImageOutputDev.cc |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 60c5e072d4b930507469e6e8c234971725a4aa26
Merge: 0d42a6d 8d62625
Author: Albert Astals Cid <aacid at kde.org>
Date:   Wed Feb 20 21:08:53 2013 +0100

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

commit 8d62625610746ad70ffb88d845791fa03f5e35cc
Author: Thomas Fischer <fischer at unix-ag.uni-kl.de>
Date:   Wed Feb 20 21:07:10 2013 +0100

    height -> maskHeight
    
    Bug #61168

diff --git a/utils/ImageOutputDev.cc b/utils/ImageOutputDev.cc
index 0c06513..8b18d2b 100644
--- a/utils/ImageOutputDev.cc
+++ b/utils/ImageOutputDev.cc
@@ -21,6 +21,7 @@
 // Copyright (C) 2009 William Bader <williambader at hotmail.com>
 // Copyright (C) 2010 Jakob Voss <jakob.voss at gbv.de>
 // Copyright (C) 2012 Adrian Johnson <ajohnson at redneon.com>
+// Copyright (C) 2013 Thomas Fischer <fischer at unix-ag.uni-kl.de>
 //
 // To see a description of the changes please see the Changelog file that
 // came with your tarball or type make ChangeLog if you are building from git
@@ -416,7 +417,7 @@ void ImageOutputDev::drawSoftMaskedImage(
   GfxImageColorMap *maskColorMap, GBool maskInterpolate) {
   if (listImages) {
     listImage(state, ref, str, width, height, colorMap, interpolate, gFalse, imgImage);
-    listImage(state, ref, maskStr, maskWidth, height, maskColorMap, maskInterpolate, gFalse, imgSmask);
+    listImage(state, ref, maskStr, maskWidth, maskHeight, maskColorMap, maskInterpolate, gFalse, imgSmask);
   } else {
     drawImage(state, ref, str, width, height, colorMap, interpolate, NULL, gFalse);
     drawImage(state, ref, maskStr, maskWidth, maskHeight,