[poppler] 2 commits - poppler/CairoOutputDev.cc

[Adrian Johnson]

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

New commits:
commit 80cf78f2020e2f4cf33ed49fe522c6861d710588
Merge: b21780e 72c8312
Author: Adrian Johnson <ajohnson at redneon.com>
Date:   Mon Mar 18 20:02:08 2013 +1030

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

commit 72c8312d77704211f55c8de35b47bd811c792878
Author: Adrian Johnson <ajohnson at redneon.com>
Date:   Sun Mar 17 19:39:14 2013 +1030

    cairo: Don't change image interpolation when printing
    
    Bug 62418

diff --git a/poppler/CairoOutputDev.cc b/poppler/CairoOutputDev.cc
index 441ca45..79d891d 100644
--- a/poppler/CairoOutputDev.cc
+++ b/poppler/CairoOutputDev.cc
@@ -1765,6 +1765,10 @@ CairoOutputDev::getFilterForSurface(cairo_surface_t *image,
   if (orig_width == 0 || orig_height == 0)
 	  return CAIRO_FILTER_NEAREST;
 
+  /* When printing, don't change the interpolation. */
+  if (printing)
+    return CAIRO_FILTER_NEAREST;
+
   int scaled_width, scaled_height;
   getScaledSize (orig_width, orig_height, &scaled_width, &scaled_height);