[poppler] Branch 'poppler-0.6' - poppler/CairoOutputDev.cc

[Jeff Muizelaar]

 poppler/CairoOutputDev.cc |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
diff-tree 136f9ceca66afadb06f3e92f89180fde48a36b05 (from 528152159c2d9bde40114be57743f2e10a8dac8d)
Author: Jeff Muizelaar <jeff at infidigm.net>
Date:   Sat Oct 6 23:27:40 2007 -0400

    Use maskWidth and maskHeight for reading from the mask image in CairoOutputDev::drawMaskedImage()
    
    Previously, drawMaskedImage() was incorrectly using the image width and height which is
    wrong when width != maskWidth or heigh != maskHeight. Fixes #12668.

diff --git a/poppler/CairoOutputDev.cc b/poppler/CairoOutputDev.cc
index 761ce14..146472b 100644
--- a/poppler/CairoOutputDev.cc
+++ b/poppler/CairoOutputDev.cc
@@ -1051,10 +1051,10 @@ void CairoOutputDev::drawMaskedImage(Gfx
   
   invert_bit = maskInvert ? 1 : 0;
 
-  for (y = 0; y < height; y++) {
+  for (y = 0; y < maskHeight; y++) {
     pix = maskImgStr->getLine();
     maskDest = maskBuffer + y * row_stride;
-    for (x = 0; x < width; x++) {
+    for (x = 0; x < maskWidth; x++) {
       if (pix[x] ^ invert_bit)
 	*maskDest++ = 0;
       else