X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=lib%2Fpdf%2FInfoOutputDev.h;h=532e2edc6bb9a600c0980247571bf8409ae63b5e;hb=11e2b8a4110ae1aa7fe6cb39f9ab3099237fe49d;hp=699c4c76a1bd2c78805f9b2dfaa237ed9a9d8699;hpb=0eaa557c36055770a90f6ea54c88f30010e1e5d9;p=swftools.git

diff --git a/lib/pdf/InfoOutputDev.h b/lib/pdf/InfoOutputDev.h
index 699c4c7..532e2ed 100644
--- a/lib/pdf/InfoOutputDev.h
+++ b/lib/pdf/InfoOutputDev.h
@@ -41,12 +41,11 @@
 #else
 #include "GHash.h"
 #endif
+#include "../gfxdevice.h"
+#include "../gfxtools.h"
+#include "../gfxfont.h"
 
-struct AdvanceSample
-{
-    double advance;
-    struct AdvanceSample*next;
-};
+#define INTERNAL_FONT_SIZE 1024.0
 
 struct GlyphInfo
 {
@@ -56,9 +55,7 @@ struct GlyphInfo
     double advance;
     double x1,y1,x2,y2;
 
-    double estimateAdvance();
-
-    AdvanceSample*advance_samples;
+    double advance_max;
 };
 
 struct FontInfo
@@ -73,6 +70,7 @@ struct FontInfo
 
     void grow(int size);
 
+    gfxfont_t*gfxfont;
     GfxFont*font;
     double max_size;
     int num_glyphs;
@@ -91,12 +89,18 @@ class InfoOutputDev: public OutputDev
     GlyphInfo* currentglyph;
     SplashOutputDev*splash;
 
+    gfxfont_t* createGfxFont(GfxFont*xpdffont, FontInfo*src);
+
     public:
     int x1,y1,x2,y2;
     int num_links;
-    int num_images;
+    int num_ppm_images;
+    int num_jpeg_images;
     int num_fonts;
     int num_polygons;
+    int num_textfields;
+
+    gfxfontlist_t*fonts;
 
     InfoOutputDev(XRef*xref);
     virtual ~InfoOutputDev();