X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=lib%2Fpdf%2FGFXOutputDev.h;h=8a8a1ca27564735427d14aebcc801368bd458b48;hb=d047ab5d9aee6224e864c10bce623e43c56a13c3;hp=bf4df4c06c164b126ef863837c4e780abd5b1120;hpb=77a2b9688db7ae0c9bda7801f19042adcc4ef1ce;p=swftools.git

diff --git a/lib/pdf/GFXOutputDev.h b/lib/pdf/GFXOutputDev.h
index bf4df4c..8a8a1ca 100644
--- a/lib/pdf/GFXOutputDev.h
+++ b/lib/pdf/GFXOutputDev.h
@@ -4,6 +4,7 @@
 #include "../gfxdevice.h"
 #include "../gfxsource.h"
 
+#include "config.h"
 #include "InfoOutputDev.h"
 #include "PDFDoc.h"
 
@@ -20,7 +21,16 @@ class GFXOutputState {
     int textRender;
     char createsoftmask;
     char transparencygroup;
+    char softmask;
+    char softmask_alpha;
+    char isolated;
+
     GFXOutputState();
+
+    gfxresult_t* grouprecording; // for transparency groups
+    gfxresult_t* softmaskrecording; // for soft masks
+
+    gfxdevice_t* olddevice;
 };
 
 typedef struct _parameter
@@ -30,9 +40,9 @@ typedef struct _parameter
     struct _parameter*next;
 } parameter_t;
 
-void addGlobalFont(char*filename);
-void addGlobalLanguageDir(char*dir);
-void addGlobalFontDir(char*dirname);
+void addGlobalFont(const char*filename);
+void addGlobalLanguageDir(const char*dir);
+void addGlobalFontDir(const char*dirname);
 
 class GFXOutputDev:  public OutputDev {
 public:
@@ -47,6 +57,7 @@ public:
 
   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;}
   
@@ -75,7 +86,7 @@ public:
   void setXRef(PDFDoc*doc, XRef *xref);
 
   //----- link borders
-  virtual void drawLink(Link *link, Catalog *catalog) ;
+  virtual void processLink(Link *link, Catalog *catalog);
 
   //----- save/restore graphics state
   virtual void saveState(GfxState *state) ;
@@ -90,7 +101,10 @@ public:
   virtual void updateLineJoin(GfxState *state);
   virtual void updateLineCap(GfxState *state);
   virtual void updateFillOpacity(GfxState *state);
-
+  virtual void updateStrokeOpacity(GfxState *state);
+  virtual void updateFillOverprint(GfxState *state);
+  virtual void updateStrokeOverprint(GfxState *state);
+  virtual void updateTransfer(GfxState *state);
   
   virtual void updateAll(GfxState *state) 
   {
@@ -110,6 +124,23 @@ public:
   //----- path clipping
   virtual void clip(GfxState *state) ;
   virtual void eoClip(GfxState *state) ;
+  virtual void clipToStrokePath(GfxState *state);
+ 
+  //----- shaded fills
+  virtual GBool useTilingPatternFill();
+  virtual GBool useShadedFills();
+
+  /*
+  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) {}
+  */
 
   //----- text drawing
   virtual void beginString(GfxState *state, GString *s) ;
@@ -140,7 +171,6 @@ public:
 				   GfxImageColorMap *maskColorMap);
 
   //----- transparency groups and soft masks (xpdf >= ~ 3.01.16)
-#if xpdfUpdateVersion >= 16
   virtual void beginTransparencyGroup(GfxState *state, double *bbox,
 				      GfxColorSpace *blendingColorSpace,
 				      GBool isolated, GBool knockout,
@@ -149,7 +179,6 @@ public:
   virtual void paintTransparencyGroup(GfxState *state, double *bbox);
   virtual void setSoftMask(GfxState *state, double *bbox, GBool alpha, Function *transferFunc, GfxColor *backdropColor);
   virtual void clearSoftMask(GfxState *state);
-#endif
  
   //----- type 3 chars
   virtual GBool beginType3Char(GfxState *state, double x, double y, double dx, double dy, CharCode code, Unicode *u, int uLen);
@@ -164,17 +193,36 @@ public:
 
   void finish();
 
+  virtual GBool useDrawForm();
+  virtual void drawForm(Ref id);
+  virtual GBool needNonText();
+  virtual void endPage();
+
+  //virtual void dump();
+  //virtual void beginStringOp(GfxState *state);
+  //virtual void drawString(GfxState *state, GString *s);
+  //virtual void endStringOp(GfxState *state);
+  //virtual GBool getVectorAntialias() { return gFalse; }
+  //virtual void setVectorAntialias(GBool vaa) {}
+  //virtual void psXObject(Stream *psStream, Stream *level1Stream) {}
+
   private:
   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 quality);
-  void strokeGfxline(GfxState *state, gfxline_t*line);
+  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);
 
+  void showfeature(const char*feature,char fully, char warn);
+  void warnfeature(const char*feature,char fully);
+  void infofeature(const char*feature);
+
   char outer_clip_box; //whether the page clip box is still on
+  
+  GBool do_interpretType3Chars;
 
   InfoOutputDev*info;
   GFXOutputState states[64];
@@ -185,7 +233,7 @@ public:
   PDFDoc*doc;
   XRef*xref;
 
-  char* searchFont(char*name);
+  char* searchFont(const char*name);
   char* substituteFont(GfxFont*gfxFont, char*oldname);
   char* writeEmbeddedFontToFile(XRef*ref, GfxFont*font);
   int t1id;
@@ -193,8 +241,6 @@ public:
   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 ttfinfo; // did we write "File contains TrueType Fonts" yet?
-  int gradientinfo; // did we write "File contains Gradients yet?
 
   int type3active; // are we between beginType3()/endType3()?
 
@@ -202,17 +248,20 @@ public:
 
   char type3Warning;
 
-  char* substitutetarget[256];
-  char* substitutesource[256];
+  const char* substitutetarget[256];
+  const char* substitutesource[256];
   int substitutepos;
 
+  int user_movex,user_movey;
+  int user_clipx1,user_clipx2,user_clipy1,user_clipy2;
+
   /* upper left corner of clipping rectangle (cropbox)- needs to be
      added to all drawing coordinates to give the impression that all
      pages start at (0,0)*/
-  int clipmovex,clipmovey;
+  int clipmovex;
+  int clipmovey;
 
-  int user_movex,user_movey;
-  int user_clipx1,user_clipx2,user_clipy1,user_clipy2;
+  double width,height;
 
   gfxline_t* current_text_stroke;
   gfxline_t* current_text_clip;
@@ -227,8 +276,9 @@ public:
   int pagepos;
 
   /* config */
-  int forceType0Fonts;
   int config_use_fontconfig;
+  int config_break_on_warning;
+  int config_remapunicode;
 
   parameter_t*parameters;
 };