poppler: fix tilingPatternFill()

[swftools.git] / lib / pdf / GFXOutputDev.h

diff --git a/lib/pdf/GFXOutputDev.h b/lib/pdf/GFXOutputDev.h
index f06dd21..f062e15 100644 (file)
--- a/lib/pdf/GFXOutputDev.h
+++ b/lib/pdf/GFXOutputDev.h
@@ -5,7 +5,6 @@
 #include "../gfxsource.h"
 #include "../gfxtools.h"
 
-#include "config.h"
 #include "InfoOutputDev.h"
 #include "PDFDoc.h"
 #include "GlobalParams.h"
@@ -73,7 +72,7 @@ public:
   virtual void setParameter(const char*key, const char*value);
   
   // Start a page.
-  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();
 
   //----- get info about output device
@@ -136,19 +135,13 @@ public:
   virtual GBool useTilingPatternFill();
   virtual GBool useShadedFills();
 
-#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);
@@ -292,6 +285,7 @@ public:
   int config_bigchar;
   int config_drawonlyshapes;
   int config_detectspaces;
+  int config_textonly;
   char* config_linkdatafile;
   double config_fontquality;
 };