X-Git-Url: http://git.asbjorn.biz/?p=swftools.git;a=blobdiff_plain;f=lib%2Fpdf%2FInfoOutputDev.h;fp=lib%2Fpdf%2FInfoOutputDev.h;h=93451f88465a213852d5c1784267af1d7ff83981;hp=ec3cdb137d954bed474bf65b7d1e76a0fba88607;hb=7c45653cc0504bc02a837a2e8050ca8f42705b09;hpb=cce10b37d5db502e4612ddfa5d7b14d41814445b

diff --git a/lib/pdf/InfoOutputDev.h b/lib/pdf/InfoOutputDev.h
index ec3cdb1..93451f8 100644
--- a/lib/pdf/InfoOutputDev.h
+++ b/lib/pdf/InfoOutputDev.h
@@ -21,20 +21,23 @@
 #ifndef __infooutputdev_h__
 #define __infooutputdev_h__
 
+#include "popplercompat.h"
 #include "GfxFont.h"
 #include "OutputDev.h"
 #include "SplashOutputDev.h"
 #include "Page.h"
+
 #ifdef HAVE_POPPLER
-#include <splash/SplashTypes.h>
-#include <splash/SplashPath.h>
-#include <splash/SplashFont.h>
-#include <splash/SplashFontFile.h>
+  #include <splash/SplashTypes.h>
+  #include <splash/SplashPath.h>
+  #include <splash/SplashFont.h>
+  #include <splash/SplashFontFile.h>
 #else
-#include "SplashTypes.h"
-#include "SplashPath.h"
-#include "SplashFont.h"
-#include "SplashFontFile.h"
+  #include "xpdf/config.h"
+  #include "SplashTypes.h"
+  #include "SplashPath.h"
+  #include "SplashFont.h"
+  #include "SplashFontFile.h"
 #endif
 
 #ifdef HAVE_POPPLER
@@ -146,24 +149,31 @@ class InfoOutputDev: public OutputDev
 			  double dx, double dy,
 			  double originX, double originY,
 			  CharCode code, int nBytes, Unicode *u, int uLen);
+
     virtual void drawImageMask(GfxState *state, Object *ref, Stream *str,
 			       int width, int height, GBool invert,
+			       POPPLER_INTERPOLATE
 			       GBool inlineImg);
     virtual void drawImage(GfxState *state, Object *ref, Stream *str,
 			   int width, int height, GfxImageColorMap *colorMap,
+			   POPPLER_INTERPOLATE
 			   int *maskColors, GBool inlineImg);
     virtual void drawMaskedImage(GfxState *state, Object *ref, Stream *str,
 				  int width, int height,
 				  GfxImageColorMap *colorMap,
+				  POPPLER_INTERPOLATE
 				  Stream *maskStr,
 				  int maskWidth, int maskHeight,
-				  GBool maskInvert);
+				  GBool maskInvert
+				  POPPLER_MASK_INTERPOLATE);
     virtual void drawSoftMaskedImage(GfxState *state, Object *ref, Stream *str,
 				      int width, int height,
 				      GfxImageColorMap *colorMap,
+				      POPPLER_INTERPOLATE
 				      Stream *maskStr,
 				      int maskWidth, int maskHeight,
-				      GfxImageColorMap *maskColorMap);
+				      GfxImageColorMap *maskColorMap
+				      POPPLER_MASK_INTERPOLATE);
 
     virtual FontInfo* getFont(char*id);
 };