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

[Carlos Garcia Campos]

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

New commits:
commit f4bfa940aa40a82a1080cdaf765da1d1615ccfb1
Author: Carlos Garcia Campos <carlosgc at gnome.org>
Date:   Sat Oct 5 11:20:04 2013 +0200

    cairo: Do not set an invalid matrix in drawImage()
    
    https://bugs.freedesktop.org/show_bug.cgi?id=70085

diff --git a/poppler/CairoOutputDev.cc b/poppler/CairoOutputDev.cc
index 26760c8..77bd245 100644
--- a/poppler/CairoOutputDev.cc
+++ b/poppler/CairoOutputDev.cc
@@ -2938,7 +2938,8 @@ void CairoOutputDev::drawImage(GfxState *state, Object *ref, Stream *str,
   if (maskPattern) {
     if (!printing)
       cairo_clip (cairo);
-    cairo_set_matrix (cairo, &mask_matrix);
+    if (mask)
+      cairo_set_matrix (cairo, &mask_matrix);
     cairo_mask (cairo, maskPattern);
   } else {
     if (printing)