X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=lib%2Fpdf%2FGFXOutputDev.h;h=645283abe78366102816889682ab148b390ba3ff;hb=6419b8664a11ae1556d7a1275eb8604479f79446;hp=a1fb83d6829d8e679e8c343cd8b5060ffedf449f;hpb=f0a09477923d23dbdd74d00209d0247ae09e7ec9;p=swftools.git

diff --git a/lib/pdf/GFXOutputDev.h b/lib/pdf/GFXOutputDev.h
index a1fb83d..645283a 100644
--- a/lib/pdf/GFXOutputDev.h
+++ b/lib/pdf/GFXOutputDev.h
@@ -3,6 +3,7 @@
 
 #include "../gfxdevice.h"
 #include "../gfxsource.h"
+#include "../gfxtools.h"
 
 #include "config.h"
 #include "InfoOutputDev.h"
@@ -95,6 +96,7 @@ public:
   //----- update graphics 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);
@@ -211,7 +213,7 @@ public:
 				   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);
+  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);
@@ -221,7 +223,9 @@ public:
   void infofeature(const char*feature);
 
   char outer_clip_box; //whether the page clip box is still on
-  
+
+  gfxfontlist_t*gfxfontlist;
+
   GBool do_interpretType3Chars;
 
   InfoOutputDev*info;
@@ -267,10 +271,9 @@ public:
   gfxline_t* current_text_clip;
   char* current_font_id;
   gfxfont_t* current_gfxfont;
+  FontInfo*current_fontinfo;
   gfxmatrix_t current_font_matrix;
 
-  fontlist_t* fontlist;
-
   int*pages;
   int pagebuflen;
   int pagepos;
@@ -278,8 +281,18 @@ public:
   /* config */
   int config_use_fontconfig;
   int config_break_on_warning;
+  int config_remapunicode;
+  int config_transparent;
+  int config_extrafontdata;
 
   parameter_t*parameters;
 };
 
+class GFXGlobalParams:  public GlobalParams {
+    public:
+    GFXGlobalParams();
+    ~GFXGlobalParams();
+    virtual DisplayFontParam *getDisplayFont(GString *fontName);
+};
+
 #endif //__gfxoutputdev_h__