implemented type3 fonts in pdf2pdf, added fontmatrix tests to testsuite

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

diff --git a/lib/pdf/GFXOutputDev.h b/lib/pdf/GFXOutputDev.h
index 9cca56d..0b07e4f 100644 (file)
--- 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);
 
@@ -277,14 +281,11 @@ 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;
   double config_fontquality;
-    
-  double *dashPattern;
-  int dashLength;
-  double dashStart;
 };
 
 class GFXGlobalParams:  public GlobalParams {