[poppler] poppler/SplashOutputDev.cc utils/ImageOutputDev.cc

[Albert Astals Cid]

 poppler/SplashOutputDev.cc |    3 ++-
 utils/ImageOutputDev.cc    |    5 +++--
 2 files changed, 5 insertions(+), 3 deletions(-)

New commits:
commit 5deb6db5d340c08f337d2ba67aa1fd690e4eedd8
Author: William Bader <williambader at hotmail.com>
Date:   Mon Jun 29 21:55:49 2009 +0200

    Fix interpolate parameter position

diff --git a/poppler/SplashOutputDev.cc b/poppler/SplashOutputDev.cc
index 0ef5c6b..78c4f1d 100644
--- a/poppler/SplashOutputDev.cc
+++ b/poppler/SplashOutputDev.cc
@@ -22,6 +22,7 @@
 // Copyright (C) 2009 Petr Gajdos <pgajdos at novell.com>
 // Copyright (C) 2009 Thomas Freitag <Thomas.Freitag at alfa.de>
 // Copyright (C) 2009 Carlos Garcia Campos <carlosgc at gnome.org>
+// Copyright (C) 2009 William Bader <williambader at hotmail.com>
 //
 // To see a description of the changes please see the Changelog file that
 // came with your tarball or type make ChangeLog if you are building from git
@@ -1971,7 +1972,7 @@ void SplashOutputDev::endMaskClip(GfxState * state) {
 
 void SplashOutputDev::drawImageMask(GfxState *state, Object *ref, Stream *str,
 				    int width, int height, GBool invert,
-				    GBool inlineImg, GBool interpolate) {
+				    GBool interpolate, GBool inlineImg) {
   double *ctm;
   SplashCoord mat[6];
   SplashOutImageMaskData imgMaskData;
diff --git a/utils/ImageOutputDev.cc b/utils/ImageOutputDev.cc
index da54fd6..7bf843f 100644
--- a/utils/ImageOutputDev.cc
+++ b/utils/ImageOutputDev.cc
@@ -18,6 +18,7 @@
 // Copyright (C) 2008 Timothy Lee <timothy.lee at siriushk.com>
 // Copyright (C) 2008 Vasile Gaburici <gaburici at cs.umd.edu>
 // Copyright (C) 2009 Carlos Garcia Campos <carlosgc at gnome.org>
+// Copyright (C) 2009 William Bader <williambader at hotmail.com>
 //
 // To see a description of the changes please see the Changelog file that
 // came with your tarball or type make ChangeLog if you are building from git
@@ -230,8 +231,8 @@ void ImageOutputDev::drawMaskedImage(
   int width, int height, GfxImageColorMap *colorMap, GBool interpolate,
   Stream *maskStr, int maskWidth, int maskHeight, GBool maskInvert, GBool maskInterpolate) {
   drawImage(state, ref, str, width, height, colorMap, interpolate, NULL, gFalse);
-  drawImageMask(state, ref, maskStr, maskWidth, maskHeight, maskInterpolate,
-		maskInvert, gFalse);
+  drawImageMask(state, ref, maskStr, maskWidth, maskHeight, maskInvert,
+		maskInterpolate, gFalse);
 }
 
 void ImageOutputDev::drawSoftMaskedImage(