X-Git-Url: http://git.asbjorn.biz/?p=swftools.git;a=blobdiff_plain;f=lib%2Fpdf%2FGFXOutputDev.h;h=f06dd21ece10ae32e16aed9161e52654d3dc77a9;hp=9cca56d2a52ad5a5d8f062141aaa6983c663ca6b;hb=f29d8006b1d8253c50808d6eb4941bdeb808c601;hpb=0e482bea37ed1f38e592247984b6e064158c8ea1

diff --git a/lib/pdf/GFXOutputDev.h b/lib/pdf/GFXOutputDev.h
index 9cca56d..f06dd21 100644
--- a/lib/pdf/GFXOutputDev.h
+++ b/lib/pdf/GFXOutputDev.h
@@ -29,6 +29,10 @@ class GFXOutputState {
     gfxresult_t* softmaskrecording; // for soft masks
 
     gfxdevice_t* olddevice;
+  
+    double *dashPattern;
+    int dashLength;
+    double dashStart;
 
     GfxState*state;
 };
@@ -224,8 +228,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);
 
@@ -270,6 +274,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;
@@ -277,14 +287,13 @@ 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;
+  char* config_linkdatafile;
   double config_fontquality;
-    
-  double *dashPattern;
-  int dashLength;
-  double dashStart;
 };
 
 class GFXGlobalParams:  public GlobalParams {