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

diff --git a/lib/pdf/InfoOutputDev.h b/lib/pdf/InfoOutputDev.h
index 25ffdfb..04e98f7 100644
--- a/lib/pdf/InfoOutputDev.h
+++ b/lib/pdf/InfoOutputDev.h
@@ -23,24 +23,58 @@
 
 #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
+#define GLYPH_IS_SPACE(g) ((!(g)->line || ((g)->line->type==gfx_moveTo && !(g)->line->next)) && (g)->advance)
 
 struct GlyphInfo
 {
     SplashPath*path;
     int unicode;
     int glyphid;
+    double advance;
     double x1,y1,x2,y2;
+
+    double advance_max;
 };
 
-struct FontInfo
+class FontInfo
 {
-    FontInfo();
+    gfxfont_t*gfxfont;
+
+    char*id;
+public:
+    FontInfo(char*id);
     ~FontInfo();
+
+    gfxfont_t* getGfxFont();
+
+    double lastx,lasty;
+    int lastchar;
+
+    double ascender,descender;
+
     void grow(int size);
 
     GfxFont*font;
@@ -50,6 +84,7 @@ struct FontInfo
     int*charid2glyph;
     SplashFont*splash_font;
     char seen;
+    int space_char;
 };
 
 extern char*getFontID(GfxFont*font);
@@ -60,11 +95,18 @@ class InfoOutputDev: public OutputDev
     FontInfo* currentfont;
     GlyphInfo* currentglyph;
     SplashOutputDev*splash;
+
     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;
+
+    void finish();
+    void dumpfonts(gfxdevice_t*dev);
 
     InfoOutputDev(XRef*xref);
     virtual ~InfoOutputDev(); 
@@ -82,6 +124,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,
@@ -105,6 +150,7 @@ class InfoOutputDev: public OutputDev
 				      Stream *maskStr,
 				      int maskWidth, int maskHeight,
 				      GfxImageColorMap *maskColorMap);
+
     virtual FontInfo* getFont(char*id);
 };