moved all fields valid for more than one page out of the class

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

diff --git a/lib/pdf/InfoOutputDev.h b/lib/pdf/InfoOutputDev.h
index 539addd..2fd3ea5 100644 (file)
--- a/lib/pdf/InfoOutputDev.h
+++ b/lib/pdf/InfoOutputDev.h
@@ -41,21 +41,36 @@
 #else
 #include "GHash.h"
 #endif
+#include "../gfxdevice.h"
+#include "../gfxtools.h"
+#include "../gfxfont.h"
+
+#define INTERNAL_FONT_SIZE 1024.0
 
 struct GlyphInfo
 {
     SplashPath*path;
     int unicode;
     int glyphid;
+    double advance;
     double x1,y1,x2,y2;
+
+    double advance_max;
 };
 
 struct FontInfo
 {
     FontInfo();
     ~FontInfo();
+
+    double lastx,lasty;
+    int lastchar;
+
+    double ascender,descender;
+
     void grow(int size);
 
+    gfxfont_t*gfxfont;
     GfxFont*font;
     double max_size;
     int num_glyphs;
@@ -74,6 +89,8 @@ class InfoOutputDev: public OutputDev
     GlyphInfo* currentglyph;
     SplashOutputDev*splash;
 
+    gfxfont_t* createGfxFont(GfxFont*xpdffont, FontInfo*src);
+
     public:
     int x1,y1,x2,y2;
     int num_links;
@@ -81,6 +98,8 @@ class InfoOutputDev: public OutputDev
     int num_fonts;
     int num_polygons;
 
+    gfxfontlist_t*fonts;
+
     InfoOutputDev(XRef*xref);
     virtual ~InfoOutputDev(); 
     virtual GBool useTilingPatternFill();