X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=lib%2Fpdf%2FGFXOutputDev.h;h=1b1c0b273dca797e6b8d393ab087818823502168;hb=8ea60b78165485862a5a872775bffabb2c912078;hp=a6ce0eff344379591f98fba1fbec40404c97a81e;hpb=9e51523b57fc5e715d498039543f8e630b664d7b;p=swftools.git

diff --git a/lib/pdf/GFXOutputDev.h b/lib/pdf/GFXOutputDev.h
index a6ce0ef..1b1c0b2 100644
--- a/lib/pdf/GFXOutputDev.h
+++ b/lib/pdf/GFXOutputDev.h
@@ -21,20 +21,23 @@ class GFXOutputState {
     char softmask_alpha;
     char isolated;
 
+    gfxbbox_t clipbbox;
+
     GFXOutputState();
 
     gfxresult_t* grouprecording; // for transparency groups
     gfxresult_t* softmaskrecording; // for soft masks
 
     gfxdevice_t* olddevice;
+
+    GfxState*state;
 };
 
-typedef struct _parameter
+typedef struct _feature
 {
-    char*name;
-    char*value;
-    struct _parameter*next;
-} parameter_t;
+    char*string;
+    struct _feature*next;
+} feature_t;
 
 void addGlobalFont(const char*filename);
 void addGlobalLanguageDir(const char*dir);
@@ -78,6 +81,7 @@ public:
 
   //----- update graphics state
 
+  virtual void updateLineDash(GfxState *state);
   virtual void updateFont(GfxState *state);
   virtual void updateFontMatrix(GfxState *state);
   virtual void updateFillColor(GfxState *state);
@@ -115,17 +119,23 @@ 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) {}
-  virtual void functionShadedFill(GfxState *state,
-				  GfxFunctionShading *shading) {}
-  virtual void axialShadedFill(GfxState *state, GfxAxialShading *shading) {}
-  virtual void radialShadedFill(GfxState *state, GfxRadialShading *shading) {}
-  */
+			     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);
+  virtual GBool radialShadedFill(GfxState *state, GfxRadialShading *shading);
 
   //----- text drawing
   virtual void beginString(GfxState *state, GString *s) ;
@@ -191,19 +201,27 @@ public:
   //virtual void psXObject(Stream *psStream, Stream *level1Stream) {}
 
   private:
+  gfxline_t* gfxPath_to_gfxline(GfxState*state, GfxPath*path, int closed, int user_movex, int user_movey);
+
+  void transformXY(GfxState*state, double x, double y, double*nx, double*ny);
+
   void drawGeneralImage(GfxState *state, Object *ref, Stream *str,
 				   int width, int height, GfxImageColorMap*colorMap, GBool invert,
 				   GBool inlineImg, int mask, int *maskColors,
 				   Stream *maskStr, int maskWidth, int maskHeight, GBool maskInvert, GfxImageColorMap*maskColorMap);
-  int setGfxFont(char*id, char*name, char*filename, double maxSize, CharCodeToUnicode*ctu);
+
   void strokeGfxline(GfxState *state, gfxline_t*line, int flags);
   void clipToGfxLine(GfxState *state, gfxline_t*line);
   void fillGfxLine(GfxState *state, gfxline_t*line);
 
+  gfxfont_t* createGfxFont(GfxFont*xpdffont, FontInfo*src);
+
   void showfeature(const char*feature,char fully, char warn);
   void warnfeature(const char*feature,char fully);
   void infofeature(const char*feature);
 
+  feature_t*featurewarnings;
+
   char outer_clip_box; //whether the page clip box is still on
 
   gfxfontlist_t*gfxfontlist;
@@ -263,9 +281,15 @@ public:
   int config_remapunicode;
   int config_transparent;
   int config_extrafontdata;
+  int config_convertgradients;
+  int config_optimize_polygons;
+  int config_multiply;
+  int config_bigchar;
   double config_fontquality;
-
-  parameter_t*parameters;
+    
+  double *dashPattern;
+  int dashLength;
+  double dashStart;
 };
 
 class GFXGlobalParams:  public GlobalParams {