X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=lib%2Fpdf%2FInfoOutputDev.h;h=2fd3ea53185257ffa29f28b2103c1c7a31310be6;hb=0e482bea37ed1f38e592247984b6e064158c8ea1;hp=25ffdfbcdce581cb0ffcca546b122ad924168a8a;hpb=75899f5941b62b46de85b6fe63d93adab6235ac6;p=swftools.git

diff --git a/lib/pdf/InfoOutputDev.h b/lib/pdf/InfoOutputDev.h
index 25ffdfb..2fd3ea5 100644
--- a/lib/pdf/InfoOutputDev.h
+++ b/lib/pdf/InfoOutputDev.h
@@ -23,26 +23,54 @@
 
 #include "GfxFont.h"
 #include "OutputDev.h"
-#include "SplashFont.h"
 #include "SplashOutputDev.h"
+#ifdef HAVE_POPPLER
+#include <splash/SplashTypes.h>
+#include <splash/SplashPath.h>
+#include <splash/SplashFont.h>
+#include <splash/SplashFontFile.h>
+#else
+#include "SplashTypes.h"
 #include "SplashPath.h"
+#include "SplashFont.h"
 #include "SplashFontFile.h"
+#endif
+
+#ifdef HAVE_POPPLER
+#include <goo/GooHash.h>
+#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;
@@ -60,11 +88,17 @@ class InfoOutputDev: public OutputDev
     FontInfo* currentfont;
     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_fonts;
+    int num_polygons;
+
+    gfxfontlist_t*fonts;
 
     InfoOutputDev(XRef*xref);
     virtual ~InfoOutputDev(); 
@@ -82,6 +116,9 @@ class InfoOutputDev: public OutputDev
     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);
     virtual void endType3Char(GfxState *state);
+  
+    virtual void fill(GfxState *state);
+    virtual void eoFill(GfxState *state);
 
     virtual void drawChar(GfxState *state, double x, double y,
 			  double dx, double dy,