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

[Adrian Johnson]

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

New commits:
commit a40b398a10b7d8e0af88c23b3706b93656482eff
Author: Adrian Johnson <ajohnson at redneon.com>
Date:   Sun Jan 15 23:52:28 2012 +1030

    cairo: restore temporary clip used in CairoOutputDev::fill when painting a mask
    
    The clip is only used to clip the paint to the fill path so it should
    be moved inside the save/restore.
    (cherry picked from commit 100488ec7db2d1f3e25bfda42c1603ca86696195)

diff --git a/poppler/CairoOutputDev.cc b/poppler/CairoOutputDev.cc
index fae0136..bf24867 100644
--- a/poppler/CairoOutputDev.cc
+++ b/poppler/CairoOutputDev.cc
@@ -729,8 +729,8 @@ void CairoOutputDev::fill(GfxState *state) {
   LOG(printf ("fill\n"));
   //XXX: how do we get the path
   if (mask) {
-    cairo_clip (cairo);
     cairo_save (cairo);
+    cairo_clip (cairo);
     cairo_set_matrix (cairo, &mask_matrix);
     cairo_mask (cairo, mask);
     cairo_restore (cairo);