X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=lib%2Fpdf%2FGFXOutputDev.h;h=f062e150f8c354f19ce58ac61e10f93d708354ae;hb=7c45653cc0504bc02a837a2e8050ca8f42705b09;hp=0b07e4ff20152f8eca532296eff8f0ec7f37b82b;hpb=580c48fef10df9184cf2728338e89f7db0fef2f5;p=swftools.git

diff --git a/lib/pdf/GFXOutputDev.h b/lib/pdf/GFXOutputDev.h
index 0b07e4f..f062e15 100644
--- 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);
@@ -274,6 +267,12 @@ public:
   FontInfo*current_fontinfo;
   gfxmatrix_t current_font_matrix;
 
+  gfxfont_t* last_char_gfxfont;
+  int last_char;
+  double last_char_x;
+  double last_char_y;
+  char last_char_was_space;
+
   /* config */
   int config_use_fontconfig;
   int config_break_on_warning;
@@ -285,6 +284,9 @@ public:
   int config_multiply;
   int config_bigchar;
   int config_drawonlyshapes;
+  int config_detectspaces;
+  int config_textonly;
+  char* config_linkdatafile;
   double config_fontquality;
 };