[poppler] Set mask matrix before drawing an image with a mask

[mkasik]

commit 85fde1222ede262e9cdddb20410b129ba2a348d4
Author: Marek Kasik <mkasik at redhat.com>
Date:   Fri May 4 13:55:30 2012 +0200

    Set mask matrix before drawing an image with a mask
    
    Resolves: #817378

 poppler-0.18.4-set-mask-matrix.patch |   10 ++++++++++
 poppler.spec                         |   11 ++++++++++-
 2 files changed, 20 insertions(+), 1 deletions(-)
---
diff --git a/poppler-0.18.4-set-mask-matrix.patch b/poppler-0.18.4-set-mask-matrix.patch
new file mode 100644
index 0000000..2a5cbb7
--- /dev/null
+++ b/poppler-0.18.4-set-mask-matrix.patch
@@ -0,0 +1,10 @@
+--- poppler-0.18.4/poppler/CairoOutputDev.cc	2012-02-15 18:06:48.000000000 +0100
++++ poppler-0.18.4/poppler/CairoOutputDev.cc	2012-05-04 13:04:57.000000000 +0200
+@@ -2789,6 +2789,7 @@ void CairoOutputDev::drawImage(GfxState
+     cairo_rectangle (cairo, 0., 0., 1., 1.);
+   if (maskPattern) {
+     cairo_clip (cairo);
++    cairo_set_matrix (cairo, &mask_matrix);
+     cairo_mask (cairo, maskPattern);
+   } else {
+     cairo_fill (cairo);
diff --git a/poppler.spec b/poppler.spec
index a4df52b..657c8cc 100644
--- a/poppler.spec
+++ b/poppler.spec
@@ -2,7 +2,7 @@
 Summary: PDF rendering library
 Name: poppler
 Version: 0.18.4
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2
 Group: Development/Libraries
 URL:     http://poppler.freedesktop.org/
@@ -15,6 +15,9 @@ Patch1: poppler-0.12.4-annot-appearance.patch
 # poppler-glib-demo, drop extraneous g_thread_init
 Patch2: poppler-0.18.1-glib.patch
 
+# https://bugzilla.redhat.com/show_bug.cgi?id=817378
+Patch3: poppler-0.18.4-set-mask-matrix.patch
+
 Requires: poppler-data >= 0.4.0
 BuildRequires: automake libtool
 BuildRequires: gettext-devel
@@ -127,6 +130,8 @@ converting PDF files to a number of other formats.
 %patch2 -p1 -b .glib
 %endif
 
+%patch3 -p1 -b .set-mask-matrix
+
 chmod -x goo/GooTimer.h
 
 iconv -f iso-8859-1 -t utf-8 < "utils/pdftohtml.1" > "utils/pdftohtml.1.utf8"
@@ -246,6 +251,10 @@ test "$(pkg-config --modversion poppler-splash)" = "%{version}"
 
 
 %changelog
+* Fri May  4 2012 Marek Kasik <mkasik at redhat.com> 0.18.4-3
+- Backport of a patch which sets mask matrix before drawing an image with a mask
+- Resolves: #817378
+
 * Tue Feb 28 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.18.4-2
 - Rebuilt for c++ ABI breakage