X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=lib%2Fpdf%2FGFXOutputDev.h;h=f062e150f8c354f19ce58ac61e10f93d708354ae;hb=fabf01ae05897e5a9ec0e357324503f582320c32;hp=063aff6c6506c0602e3c35a9d58e7ff79a21e0d0;hpb=36bc7214626310b6ab79d9246cdec806c2da55ca;p=swftools.git

diff --git a/lib/pdf/GFXOutputDev.h b/lib/pdf/GFXOutputDev.h
index 063aff6..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"
@@ -29,6 +28,10 @@ class GFXOutputState {
     gfxresult_t* softmaskrecording; // for soft masks
 
     gfxdevice_t* olddevice;
+  
+    double *dashPattern;
+    int dashLength;
+    double dashStart;
 
     GfxState*state;
 };
@@ -46,14 +49,11 @@ void addGlobalFontDir(const char*dirname);
 class GFXOutputGlobals {
 public:
   feature_t*featurewarnings;
-  gfxfontlist_t*gfxfontlist;
+
   int textmodeinfo; // did we write "Text will be rendered as polygon" yet?
   int jpeginfo; // did we write "File contains jpegs" yet?
   int pbminfo; // did we write "File contains jpegs" yet?
   int linkinfo; // did we write "File contains links" yet?
-  int*pages;
-  int pagebuflen;
-  int pagepos;
 
   GFXOutputGlobals();
   ~GFXOutputGlobals();
@@ -72,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
@@ -135,19 +135,13 @@ public:
   virtual GBool useTilingPatternFill();
   virtual GBool useShadedFills();
 
-#if (xpdfMajorVersion < 3) || (xpdfMinorVersion < 2) || (xpdfUpdateVersion < 7)
-  virtual void tilingPatternFill(GfxState *state, 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,
+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);
-#endif
   virtual GBool functionShadedFill(GfxState *state,
 				   GfxFunctionShading *shading);
   virtual GBool axialShadedFill(GfxState *state, GfxAxialShading *shading);
@@ -198,8 +192,6 @@ public:
   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);
 
-  virtual void preparePage(int pdfpage, int outputpage);
-
   char* searchForSuitableFont(GfxFont*gfxFont);
 
   void finish();
@@ -216,6 +208,8 @@ public:
   //virtual void setVectorAntialias(GBool vaa) {}
   //virtual void psXObject(Stream *psStream, Stream *level1Stream) {}
 
+  virtual void setPageMap(int*pagemap, int pagemap_len);
+
   private:
   gfxline_t* gfxPath_to_gfxline(GfxState*state, GfxPath*path, int closed, int user_movex, int user_movey);
 
@@ -227,8 +221,8 @@ public:
 				   Stream *maskStr, int maskWidth, int maskHeight, GBool maskInvert, GfxImageColorMap*maskColorMap);
 
   void strokeGfxline(GfxState *state, gfxline_t*line, int flags);
-  void clipToGfxLine(GfxState *state, gfxline_t*line);
-  void fillGfxLine(GfxState *state, gfxline_t*line);
+  void clipToGfxLine(GfxState *state, gfxline_t*line, char evenodd);
+  void fillGfxLine(GfxState *state, gfxline_t*line, char evenodd);
 
   gfxfont_t* createGfxFont(GfxFont*xpdffont, FontInfo*src);
 
@@ -240,6 +234,10 @@ public:
   char* substituteFont(GfxFont*gfxFont, char*oldname);
   char* writeEmbeddedFontToFile(XRef*ref, GfxFont*font);
 
+  /* for page mapping */
+  int* page2page;
+  int num_pages;
+
 
   int currentpage;
   char outer_clip_box; //whether the page clip box is still on
@@ -269,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;
@@ -276,14 +280,14 @@ public:
   int config_transparent;
   int config_extrafontdata;
   int config_convertgradients;
-  int config_optimize_polygons;
+  int config_disable_polygon_conversion;
   int config_multiply;
   int config_bigchar;
+  int config_drawonlyshapes;
+  int config_detectspaces;
+  int config_textonly;
+  char* config_linkdatafile;
   double config_fontquality;
-    
-  double *dashPattern;
-  int dashLength;
-  double dashStart;
 };
 
 class GFXGlobalParams:  public GlobalParams {