X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;ds=sidebyside;f=lib%2Fpdf%2FInfoOutputDev.cc;h=c2accf29c8dadd7dac06ffb1a2773ad9f0b4f1fa;hb=0eaa557c36055770a90f6ea54c88f30010e1e5d9;hp=7a42e734cd073db7bd8be39bbbc868ae9da16a2c;hpb=6179361ff3d4f22a2cbb83895768392556093362;p=swftools.git

diff --git a/lib/pdf/InfoOutputDev.cc b/lib/pdf/InfoOutputDev.cc
index 7a42e73..c2accf2 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);
@@ -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()
 {
@@ -152,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);
@@ -181,13 +207,63 @@ void InfoOutputDev::drawChar(GfxState *state, double x, double y,
     GlyphInfo*g = currentfont->glyphs[code];
     if(!g) {
 	g = currentfont->glyphs[code] = new GlyphInfo();
+	g->advance_samples = 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) {
+	    AdvanceSample* old = g->advance_samples;
+	    g->advance_samples = new AdvanceSample();
+	    g->advance_samples->next = old;
+	    g->advance_samples->advance = xshift;
+	}
+    }
+
+    currentfont->lastx = x;
+    currentfont->lasty = y;
+    currentfont->lastchar = code;
+}
+
+static int compare_double(const void *_a, const void *_b)
+{
+    const double*a = (const double*)_a;
+    const double*b = (const double*)_b;
+    if(*a < *b) 
+	return -1;
+    if(*a > *b) 
+	return 1;
+    return 0;
+}
 
+double GlyphInfo::estimateAdvance()
+{
+    AdvanceSample*a = advance_samples;
+    int n=0;
+    while(a) {
+	n++;
+	a = a->next;
+    }
+    if(!n)
+	return -1;
+    double*list = (double*)malloc(sizeof(double)*n);
+    n = 0;
+    a = advance_samples;
+    while(a) {
+	list[n++] = a->advance;
+	a = a->next;
+    }
+    // FIXME: a true median algorithm would be faster
+    qsort(list, n, sizeof(double), compare_double);
+    double median = list[n/2];
+    free(list);
+    return median;
 }
 
 GBool InfoOutputDev::beginType3Char(GfxState *state, double x, double y, double dx, double dy, CharCode code, Unicode *u, int uLen)