X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=lib%2Fpdf%2FInfoOutputDev.cc;h=75644bcf4a980c6dd2b03948fa6856a819f7f314;hb=bf04757cd94e94c1f67fa3d2a4e3e59fa5bce0c0;hp=1d22a8bcd734b4da4b67d0c0038926bc4ea19fe2;hpb=6419b8664a11ae1556d7a1275eb8604479f79446;p=swftools.git

diff --git a/lib/pdf/InfoOutputDev.cc b/lib/pdf/InfoOutputDev.cc
index 1d22a8b..75644bc 100644
--- a/lib/pdf/InfoOutputDev.cc
+++ b/lib/pdf/InfoOutputDev.cc
@@ -1,16 +1,36 @@
-#include "SplashTypes.h"
+#include "config.h"
+#include "Object.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 "InfoOutputDev.h"
+#include "SplashFont.h"
+#include "SplashFontFile.h"
+#endif
 #include "GfxState.h"
 #include "../log.h"
 #include <math.h>
 
+/* there's not yet a way to set this */
+int config_fontquality = 10;
+int config_bigchar = 0;
+
 InfoOutputDev::InfoOutputDev(XRef*xref) 
 {
     num_links = 0;
-    num_images = 0;
+    num_jpeg_images = 0;
+    num_ppm_images = 0;
+    num_textfields = 0;
     num_fonts = 0;
+    num_polygons= 0;
+    currentfont = 0;
+    currentglyph = 0;
     id2font = new GHash(1);
     SplashColor white = {255,255,255};
     splash = new SplashOutputDev(splashModeRGB8,320,0,white,0,0);
@@ -27,8 +47,8 @@ InfoOutputDev::~InfoOutputDev()
     }
     id2font->killIter(&i);
 
-    delete id2font;
-    delete splash;
+    delete id2font;id2font=0;
+    delete splash;splash=0;
 }
 void FontInfo::grow(int size)
 {
@@ -38,15 +58,22 @@ void FontInfo::grow(int size)
 	this->num_glyphs = size;
     }
 }
-FontInfo::FontInfo()
+FontInfo::FontInfo(char*id)
 {
+    this->id = strdup(id);
     this->charid2glyph = 0;
     this->seen = 0;
     this->num_glyphs = 0;
     this->glyphs = 0;
+    this->splash_font = 0;
+    this->lastchar = -1;
+    this->lastx = 0;
+    this->lasty = 0;
+    this->gfxfont = 0;
 }
 FontInfo::~FontInfo()
 {
+    if(this->id) {free(this->id);this->id=0;}
     this->font = 0;
     if(this->charid2glyph) {
 	free(this->charid2glyph);
@@ -60,7 +87,108 @@ FontInfo::~FontInfo()
 	    glyphs[t]=0;
 	}
     }
+    free(glyphs);glyphs=0;
+    if(this->gfxfont)
+        gfxfont_free(this->gfxfont);
 }
+
+gfxfont_t* createGfxFont(FontInfo*src)
+{
+    gfxfont_t*font = (gfxfont_t*)malloc(sizeof(gfxfont_t));
+    memset(font, 0, sizeof(gfxfont_t));
+
+    font->glyphs = (gfxglyph_t*)malloc(sizeof(gfxglyph_t)*src->num_glyphs);
+    memset(font->glyphs, 0, sizeof(gfxglyph_t)*src->num_glyphs);
+    font->id = 0;
+    int t;
+
+    double quality = (INTERNAL_FONT_SIZE * 200 / config_fontquality) / src->max_size;
+    double scale = 1;
+    //printf("%d glyphs\n", font->num_glyphs);
+    font->num_glyphs = 0;
+    font->ascent = fabs(src->descender);
+    font->descent = fabs(src->ascender);
+    
+    for(t=0;t<src->num_glyphs;t++) {
+	if(src->glyphs[t]) {
+	    SplashPath*path = src->glyphs[t]->path;
+	    int len = path?path->getLength():0;
+	    //printf("glyph %d) %08x (%d line segments)\n", t, path, len);
+	    gfxglyph_t*glyph = &font->glyphs[font->num_glyphs];
+	    src->glyphs[t]->glyphid = font->num_glyphs;
+	    glyph->unicode = src->glyphs[t]->unicode;
+	    if(glyph->unicode >= font->max_unicode)
+		font->max_unicode = glyph->unicode+1;
+	    gfxdrawer_t drawer;
+	    gfxdrawer_target_gfxline(&drawer);
+	    int s;
+	    int count = 0;
+	    double xmax = 0;
+	    for(s=0;s<len;s++) {
+		Guchar f;
+		double x, y;
+		path->getPoint(s, &x, &y, &f);
+		if(!s || x > xmax)
+		    xmax = x;
+		if(f&splashPathFirst) {
+		    drawer.moveTo(&drawer, x*scale, y*scale);
+		}
+		if(f&splashPathCurve) {
+		    double x2,y2;
+		    path->getPoint(++s, &x2, &y2, &f);
+		    if(f&splashPathCurve) {
+			double x3,y3;
+			path->getPoint(++s, &x3, &y3, &f);
+			gfxdraw_cubicTo(&drawer, x*scale, y*scale, x2*scale, y2*scale, x3*scale, y3*scale, quality);
+		    } else {
+			drawer.splineTo(&drawer, x*scale, y*scale, x2*scale, y2*scale);
+		    }
+		} else {
+		    drawer.lineTo(&drawer, x*scale, y*scale);
+		}
+	     //   printf("%f %f %s %s\n", x, y, (f&splashPathCurve)?"curve":"",
+	     //       			  (f&splashPathFirst)?"first":"",
+	     //       			  (f&splashPathLast)?"last":"");
+	    }
+
+	    glyph->line = (gfxline_t*)drawer.result(&drawer);
+	    if(src->glyphs[t]->advance>0) {
+		glyph->advance = src->glyphs[t]->advance;
+	    } else {
+		msg("<warning> Approximating advance value for glyph %d", t);
+		glyph->advance = xmax*scale;
+	    }
+	    if(config_bigchar) {
+		double max = src->glyphs[t]->advance_max;
+		if(max>0 && max > glyph->advance) {
+		    glyph->advance = max;
+		}
+	    }
+
+	    font->num_glyphs++;
+	}
+    }
+    font->unicode2glyph = (int*)malloc(sizeof(int)*font->max_unicode);
+    memset(font->unicode2glyph, -1, sizeof(int)*font->max_unicode);
+    for(t=0;t<font->num_glyphs;t++) {
+	if(font->glyphs[t].unicode>0 && font->glyphs[t].unicode<font->max_unicode) {
+	    font->unicode2glyph[font->glyphs[t].unicode] = t;
+	}
+
+    }
+    return font;
+}
+
+
+gfxfont_t* FontInfo::getGfxFont()
+{
+    if(!this->gfxfont) {
+        this->gfxfont = createGfxFont(this);
+        this->gfxfont->id = strdup(this->id);
+    }
+    return this->gfxfont;
+}
+
 GBool InfoOutputDev::upsideDown() {return gTrue;}
 GBool InfoOutputDev::useDrawChar() {return gTrue;}
 GBool InfoOutputDev::interpretType3Chars() {return gTrue;}
@@ -79,10 +207,23 @@ void InfoOutputDev::startPage(int pageNum, GfxState *state, double crop_x1, doub
     this->y2 = (int)y2;
     msg("<verbose> Generating info structure for page %d", pageNum);
 }
+void InfoOutputDev::endPage()
+{
+}
 void InfoOutputDev::drawLink(Link *link, Catalog *catalog) 
 {
     num_links++;
 }
+   
+/*  } else if(!strcmp(key,"fontquality")) {
+        this->config_fontquality = atof(value);
+	if(this->config_fontquality<=1)
+	    this->config_fontquality=1;
+    } else if(!strcmp(key,"bigchar")) {
+        this->config_bigchar = atoi(value);
+    }
+ */
+
 double InfoOutputDev::getMaximumFontSize(char*id)
 {
     FontInfo*info = (FontInfo*)id2font->lookup(id);
@@ -114,43 +255,55 @@ char*getFontID(GfxFont*font)
 void InfoOutputDev::updateFont(GfxState *state) 
 {
     GfxFont*font = state->getFont();
-    if(!font)
+    if(!font) {
+	currentfont = 0;
 	return;
+    }
     if(font->getType() == fontType3) {
+	currentfont = 0;
 	return;
     }
     char*id = getFontID(font);
 
-    FontInfo*info = (FontInfo*)id2font->lookup(id);
-    if(info) {
-	/* font already known */
-	free(id);
-	currentfont = info;
-	return;
-    }
+    if(currentfont)
+	currentfont->splash_font = 0;
 
-    info = new FontInfo;
-    info->font = font;
-    info->max_size = 0;
+    currentfont = (FontInfo*)id2font->lookup(id);
+    if(!currentfont) {
+	currentfont = new FontInfo(id);
+	currentfont->font = font;
+	currentfont->max_size = 0;
+	GString* idStr = new GString(id);
+	id2font->add(idStr, (void*)currentfont);
+	num_fonts++;
+    }
 
     state->setCTM(1.0,0,0,1.0,0,0);
     splash->updateCTM(state, 0,0,0,0,0,0);
-    state->setTextMat(1.0,0,0,-1.0,0,0);
+    state->setTextMat(1.0,0,0,1.0,0,0);
     state->setFont(font, 1024.0);
     splash->doUpdateFont(state);
-    info->splash_font = splash->getCurrentFont();
-
-    if(!info->splash_font) {
-	delete info;
-	return;
+    currentfont->splash_font = splash->getCurrentFont();
+    if(currentfont->splash_font) {
+        currentfont->ascender = currentfont->splash_font->ascender;
+        currentfont->descender = currentfont->splash_font->descender;
+    } else {
+        currentfont->ascender = currentfont->descender = 0;
     }
- 
-    GString* idStr = new GString(id);
-    id2font->add(idStr, (void*)info);
-    num_fonts++;
-    currentfont = info;
+
     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);
@@ -168,20 +321,38 @@ void InfoOutputDev::drawChar(GfxState *state, double x, double y,
     double lenx = sqrt(m11*m11 + m12*m12);
     double leny = sqrt(m21*m21 + m22*m22);
     double len = lenx>leny?lenx:leny;
+    if(!currentfont || !currentfont->splash_font) {
+	return; //error
+    }
     if(currentfont && currentfont->max_size < len) {
 	currentfont->max_size = len;
     }
+    
+    num_textfields++;
+
     currentfont->grow(code+1);
     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)
@@ -195,7 +366,7 @@ GBool InfoOutputDev::beginType3Char(GfxState *state, double x, double y, double
     char*id = getFontID(font);
     currentfont = (FontInfo*)id2font->lookup(id);
     if(!currentfont) {
-	currentfont = new FontInfo;
+	currentfont = new FontInfo(id);
 	currentfont->font = font;
 	GString* idStr = new GString(id);
 	id2font->add(idStr, (void*)currentfont);
@@ -212,7 +383,7 @@ GBool InfoOutputDev::beginType3Char(GfxState *state, double x, double y, double
 	currentglyph->x1=0;
 	currentglyph->y1=0;
 	currentglyph->x2=dx;
-	currentglyph->y2=-dy;
+	currentglyph->y2=dy;
 	return gFalse;
     } else {
 	return gTrue;
@@ -224,15 +395,15 @@ void InfoOutputDev::type3D0(GfxState *state, double wx, double wy)
     currentglyph->x1=0;
     currentglyph->y1=0;
     currentglyph->x2=wx;
-    currentglyph->y2=-wy;
+    currentglyph->y2=wy;
 }
 
 void InfoOutputDev::type3D1(GfxState *state, double wx, double wy, double llx, double lly, double urx, double ury)
 {
     currentglyph->x1=llx;
-    currentglyph->y1=-lly;
+    currentglyph->y1=lly;
     currentglyph->x2=urx;
-    currentglyph->y2=-ury;
+    currentglyph->y2=ury;
 }
 
 void InfoOutputDev::endType3Char(GfxState *state)
@@ -252,14 +423,16 @@ void InfoOutputDev::drawImageMask(GfxState *state, Object *ref, Stream *str,
 			   int width, int height, GBool invert,
 			   GBool inlineImg) 
 {
-    num_images++;
+    if(str->getKind()==strDCT) num_jpeg_images++; else num_ppm_images++;
+
     OutputDev::drawImageMask(state,ref,str,width,height,invert,inlineImg);
 }
 void InfoOutputDev::drawImage(GfxState *state, Object *ref, Stream *str,
 		       int width, int height, GfxImageColorMap *colorMap,
 		       int *maskColors, GBool inlineImg)
 {
-    num_images++;
+    if(str->getKind()==strDCT) num_jpeg_images++; else num_ppm_images++;
+
     OutputDev::drawImage(state,ref,str,width,height,colorMap,maskColors,inlineImg);
 }
 void InfoOutputDev::drawMaskedImage(GfxState *state, Object *ref, Stream *str,
@@ -269,6 +442,8 @@ void InfoOutputDev::drawMaskedImage(GfxState *state, Object *ref, Stream *str,
 				int maskWidth, int maskHeight,
 				GBool maskInvert) 
 {
+    if(str->getKind()==strDCT) num_jpeg_images++; else num_ppm_images++;
+
     OutputDev::drawMaskedImage(state,ref,str,width,height,colorMap,maskStr,maskWidth,maskHeight,maskInvert);
 }
 
@@ -279,5 +454,18 @@ void InfoOutputDev::drawSoftMaskedImage(GfxState *state, Object *ref, Stream *st
 				    int maskWidth, int maskHeight,
 				    GfxImageColorMap *maskColorMap) 
 {
+    if(str->getKind()==strDCT) num_jpeg_images++; else num_ppm_images++;
+
     OutputDev::drawSoftMaskedImage(state,ref,str,width,height,colorMap,maskStr,maskWidth,maskHeight,maskColorMap);
 }
+    
+void InfoOutputDev::dumpfonts(gfxdevice_t*dev)
+{
+    GHashIter*i;
+    GString*key;
+    FontInfo*font;
+    id2font->startIter(&i);
+    while(id2font->getNext(&i, &key, (void**)&font)) {
+        dev->addfont(dev, font->getGfxFont());
+    }
+}