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

diff --git a/lib/pdf/GFXOutputDev.h b/lib/pdf/GFXOutputDev.h
index 0e3d2b3..1b1c0b2 100644
--- a/lib/pdf/GFXOutputDev.h
+++ b/lib/pdf/GFXOutputDev.h
@@ -8,13 +8,8 @@
 #include "config.h"
 #include "InfoOutputDev.h"
 #include "PDFDoc.h"
-
-typedef struct _fontlist
-{
-    char*filename;
-    gfxfont_t*font;
-    _fontlist*next;
-} fontlist_t;
+#include "GlobalParams.h"
+#include "CommonOutputDev.h"
 
 class GFXOutputState {
     public:
@@ -26,48 +21,43 @@ 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);
 void addGlobalFontDir(const char*dirname);
 
-class GFXOutputDev:  public OutputDev {
+class GFXOutputDev:  public CommonOutputDev {
 public:
   gfxdevice_t* device;
 
-  // Constructor.
-  GFXOutputDev(parameter_t*p);
-  void setDevice(gfxdevice_t*dev);
-
-  // Destructor.
+  GFXOutputDev(InfoOutputDev*info, PDFDoc*doc);
   virtual ~GFXOutputDev() ;
 
-  void setMove(int x,int y);
-  void setClip(int x1,int y1,int x2,int y2);
-  void setParameter(const char*key, const char*value);
-
-  void setInfo(InfoOutputDev*info) {this->info = info;}
+  virtual void setDevice(gfxdevice_t*dev);
+  virtual void setMove(int x,int y);
+  virtual void setClip(int x1,int y1,int x2,int y2);
+  virtual void setParameter(const char*key, const char*value);
   
   // Start a page.
-  void startFrame(int width, int height);
-
   virtual void startPage(int pageNum, GfxState *state, double x1, double y1, double x2, double y2) ;
-
-  void endframe();
+  virtual void endPage();
 
   //----- get info about output device
 
@@ -82,10 +72,6 @@ public:
   
   //virtual GBool useShadedFills() { return gTrue; }
 
-  //----- initialization and control
-
-  void setXRef(PDFDoc*doc, XRef *xref);
-
   //----- link borders
   virtual void processLink(Link *link, Catalog *catalog);
 
@@ -95,7 +81,9 @@ public:
 
   //----- update graphics state
 
+  virtual void updateLineDash(GfxState *state);
   virtual void updateFont(GfxState *state);
+  virtual void updateFontMatrix(GfxState *state);
   virtual void updateFillColor(GfxState *state);
   virtual void updateStrokeColor(GfxState *state);
   virtual void updateLineWidth(GfxState *state);
@@ -131,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) ;
@@ -188,7 +182,7 @@ 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);
 
-  void preparePage(int pdfpage, int outputpage);
+  virtual void preparePage(int pdfpage, int outputpage);
 
   char* searchForSuitableFont(GfxFont*gfxFont);
 
@@ -197,7 +191,6 @@ public:
   virtual GBool useDrawForm();
   virtual void drawForm(Ref id);
   virtual GBool needNonText();
-  virtual void endPage();
 
   //virtual void dump();
   //virtual void beginStringOp(GfxState *state);
@@ -208,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;
@@ -264,11 +265,8 @@ public:
   int clipmovex;
   int clipmovey;
 
-  double width,height;
-
   gfxline_t* current_text_stroke;
   gfxline_t* current_text_clip;
-  char* current_font_id;
   gfxfont_t* current_gfxfont;
   FontInfo*current_fontinfo;
   gfxmatrix_t current_font_matrix;
@@ -282,8 +280,16 @@ public:
   int config_break_on_warning;
   int config_remapunicode;
   int config_transparent;
-
-  parameter_t*parameters;
+  int config_extrafontdata;
+  int config_convertgradients;
+  int config_optimize_polygons;
+  int config_multiply;
+  int config_bigchar;
+  double config_fontquality;
+    
+  double *dashPattern;
+  int dashLength;
+  double dashStart;
 };
 
 class GFXGlobalParams:  public GlobalParams {