X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=lib%2Fpdf%2FInfoOutputDev.cc;h=a10f4bd2e0272469f506943533759c0879328a10;hb=b0d6b177b15ec7aff4c132353366b946aa382a89;hp=fd334525570988b0b6939b53df40c6f8647cad13;hpb=0784a8a882e7b98299fb6a90f0f9a7ebb322562b;p=swftools.git

diff --git a/lib/pdf/InfoOutputDev.cc b/lib/pdf/InfoOutputDev.cc
index fd33452..a10f4bd 100644
--- a/lib/pdf/InfoOutputDev.cc
+++ b/lib/pdf/InfoOutputDev.cc
@@ -1,9 +1,18 @@
+#include "config.h"
 #include "Object.h"
-#include "SplashTypes.h"
+#include "InfoOutputDev.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"
-#include "InfoOutputDev.h"
+#endif
 #include "GfxState.h"
 #include "../log.h"
 #include <math.h>
@@ -13,6 +22,7 @@ InfoOutputDev::InfoOutputDev(XRef*xref)
     num_links = 0;
     num_images = 0;
     num_fonts = 0;
+    num_polygons= 0;
     currentfont = 0;
     currentglyph = 0;
     id2font = new GHash(1);
@@ -31,8 +41,8 @@ InfoOutputDev::~InfoOutputDev()
     }
     id2font->killIter(&i);
 
-    delete id2font;
-    delete splash;
+    delete id2font;id2font=0;
+    delete splash;splash=0;
 }
 void FontInfo::grow(int size)
 {
@@ -49,6 +59,9 @@ FontInfo::FontInfo()
     this->num_glyphs = 0;
     this->glyphs = 0;
     this->splash_font = 0;
+    this->lastchar = -1;
+    this->lastx = 0;
+    this->lasty = 0;
 }
 FontInfo::~FontInfo()
 {
@@ -65,6 +78,7 @@ FontInfo::~FontInfo()
 	    glyphs[t]=0;
 	}
     }
+    free(glyphs);glyphs=0;
 }
 GBool InfoOutputDev::upsideDown() {return gTrue;}
 GBool InfoOutputDev::useDrawChar() {return gTrue;}
@@ -151,8 +165,21 @@ void InfoOutputDev::updateFont(GfxState *state)
     state->setFont(font, 1024.0);
     splash->doUpdateFont(state);
     currentfont->splash_font = splash->getCurrentFont();
+    currentfont->ascender = currentfont->splash_font->ascender;
+    currentfont->descender = currentfont->splash_font->descender;
     free(id);
 }
+
+void InfoOutputDev::fill(GfxState *state)
+{
+    num_polygons++;
+}
+
+void InfoOutputDev::eoFill(GfxState *state)
+{
+    num_polygons++;
+}
+
 FontInfo* InfoOutputDev::getFont(char*id)
 {
     return (FontInfo*)id2font->lookup(id);
@@ -180,13 +207,25 @@ void InfoOutputDev::drawChar(GfxState *state, double x, double y,
     GlyphInfo*g = currentfont->glyphs[code];
     if(!g) {
 	g = currentfont->glyphs[code] = new GlyphInfo();
+	g->advance_max = 0;
+	currentfont->splash_font->last_advance = -1;
 	g->path = currentfont->splash_font->getGlyphPath(code);
+	g->advance = currentfont->splash_font->last_advance;
 	g->unicode = 0;
     }
     if(uLen && (u[0]>=32 && u[0]<g->unicode || !g->unicode)) {
 	g->unicode = u[0];
     }
+    if(currentfont->lastchar>=0 && currentfont->lasty == y) {
+	double xshift = x - currentfont->lastx;
+	if(xshift>=0 && xshift > g->advance_max) {
+	    g->advance_max = xshift;
+	}
+    }
 
+    currentfont->lastx = x;
+    currentfont->lasty = y;
+    currentfont->lastchar = code;
 }
 
 GBool InfoOutputDev::beginType3Char(GfxState *state, double x, double y, double dx, double dy, CharCode code, Unicode *u, int uLen)