X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=lib%2Fpdf%2FFullBitmapOutputDev.h;h=22ae6353fc1bf97fe8a28f23f0cf13962ab47463;hb=refs%2Fheads%2Fpoppler;hp=59e4ef7fc4cd6ede95635e7453c5ae8cbbc58ed1;hpb=eed4136dd1e5d7036630bd9ef29faa7e11a8f0ef;p=swftools.git

diff --git a/lib/pdf/FullBitmapOutputDev.h b/lib/pdf/FullBitmapOutputDev.h
index 59e4ef7..22ae635 100644
--- a/lib/pdf/FullBitmapOutputDev.h
+++ b/lib/pdf/FullBitmapOutputDev.h
@@ -24,7 +24,7 @@
 #include "../gfxsource.h"
 #include "../gfxtools.h"
 
-#include "config.h"
+#include "../../config.h"
 #include "GFXOutputDev.h"
 #include "InfoOutputDev.h"
 #include "PDFDoc.h"
@@ -44,7 +44,7 @@ public:
     virtual void setMove(int x,int y);
     virtual void setClip(int x1,int y1,int x2,int y2);
     virtual void setParameter(const char*key, const char*value);
-    virtual void preparePage(int pdfpage, int outputpage);
+    virtual void setPageMap(int*pagemap, int pagemap_len);
 
     // OutputDev:
     virtual GBool upsideDown();
@@ -55,14 +55,14 @@ public:
     virtual GBool interpretType3Chars();
     virtual GBool needNonText();
     virtual void setDefaultCTM(double *ctm);
-/*    virtual GBool checkPageSlice(Page *page, double hDPI, double vDPI,
+    virtual GBool checkPageSlice(Page *page, double hDPI, double vDPI,
 			       int rotate, GBool useMediaBox, GBool crop,
 			       int sliceX, int sliceY, int sliceW, int sliceH,
 			       GBool printing, Catalog *catalog,
 			       GBool (*abortCheckCbk)(void *data) = NULL,
-			       void *abortCheckCbkData = NULL);*/
+			       void *abortCheckCbkData = NULL);
 
-    virtual void startPage(int pageNum, GfxState *state, double x1,double y1,double x2,double y2);
+    virtual void startPage(int pageNum, GfxState *state);
     virtual void endPage();
 
     virtual void saveState(GfxState *state);
@@ -100,24 +100,17 @@ public:
     virtual void stroke(GfxState *state);
     virtual void fill(GfxState *state);
     virtual void eoFill(GfxState *state);
-#if (xpdfMajorVersion < 3) || (xpdfMinorVersion < 2) || (xpdfUpdateVersion < 7)
-    virtual void tilingPatternFill(GfxState *state, Object *str,
+    virtual POPPLER_TILING_PATERN_RETURN tilingPatternFill(GfxState *state,
+             POPPLER_TILING_PATERN_GFX Object *str,
 			       int paintType, Dict *resDict,
 			       double *mat, double *bbox,
 			       int x0, int y0, int x1, int y1,
 			       double xStep, double yStep);
-#else
-    virtual void tilingPatternFill(GfxState *state, Gfx *gfx, Object *str,
-			       int paintType, Dict *resDict,
-			       double *mat, double *bbox,
-			       int x0, int y0, int x1, int y1,
-			       double xStep, double yStep);
-#endif
 
     virtual GBool functionShadedFill(GfxState *state,
 				     GfxFunctionShading *shading);
-    virtual GBool axialShadedFill(GfxState *state, GfxAxialShading *shading);
-    virtual GBool radialShadedFill(GfxState *state, GfxRadialShading *shading);
+    virtual GBool axialShadedFill(GfxState *state, GfxAxialShading *shading POPPLER_RAXIAL_MIN_MAX);
+    virtual GBool radialShadedFill(GfxState *state, GfxRadialShading *shading POPPLER_RAXIAL_MIN_MAX);
 
     virtual void clip(GfxState *state);
     virtual void eoClip(GfxState *state);
@@ -140,21 +133,27 @@ public:
 
     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 void type3D0(GfxState *state, double wx, double wy);
     virtual void type3D1(GfxState *state, double wx, double wy, double llx, double lly, double urx, double ury);
@@ -195,3 +194,6 @@ private:
 };
 
 #endif
+
+
+