X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=lib%2Fpdf%2FInfoOutputDev.cc;h=a0a4cacd73630b40649575260bbfbfa54cd76d15;hb=6a529bfa890997a55fec9ae0e0d388cf9d5276c2;hp=ec545726a30437f8e7ce068b44e33bb3e9fdcd06;hpb=c6d815f656ed77b45bfb5685c030c97f6245044c;p=swftools.git

diff --git a/lib/pdf/InfoOutputDev.cc b/lib/pdf/InfoOutputDev.cc
index ec54572..a0a4cac 100644
--- a/lib/pdf/InfoOutputDev.cc
+++ b/lib/pdf/InfoOutputDev.cc
@@ -1,6 +1,8 @@
+#include "Object.h"
 #include "SplashTypes.h"
 #include "SplashOutputDev.h"
 #include "SplashPath.h"
+#include "SplashFontFile.h"
 #include "InfoOutputDev.h"
 #include "GfxState.h"
 #include "../log.h"
@@ -11,6 +13,9 @@ InfoOutputDev::InfoOutputDev(XRef*xref)
     num_links = 0;
     num_images = 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,12 +32,24 @@ InfoOutputDev::~InfoOutputDev()
     }
     id2font->killIter(&i);
 
-    delete id2font;
-    delete splash;
+    delete id2font;id2font=0;
+    delete splash;splash=0;
+}
+void FontInfo::grow(int size)
+{
+    if(size >= this->num_glyphs) {
+	this->glyphs = (GlyphInfo**)realloc(this->glyphs, sizeof(GlyphInfo*)*(size));
+	memset(&this->glyphs[this->num_glyphs], 0, sizeof(SplashPath*)*((size)-this->num_glyphs));
+	this->num_glyphs = size;
+    }
 }
 FontInfo::FontInfo()
 {
     this->charid2glyph = 0;
+    this->seen = 0;
+    this->num_glyphs = 0;
+    this->glyphs = 0;
+    this->splash_font = 0;
 }
 FontInfo::~FontInfo()
 {
@@ -49,11 +66,13 @@ FontInfo::~FontInfo()
 	    glyphs[t]=0;
 	}
     }
+    free(glyphs);glyphs=0;
 }
 GBool InfoOutputDev::upsideDown() {return gTrue;}
 GBool InfoOutputDev::useDrawChar() {return gTrue;}
 GBool InfoOutputDev::interpretType3Chars() {return gTrue;}
 GBool InfoOutputDev::useTilingPatternFill() {return gTrue;}
+
 void InfoOutputDev::startPage(int pageNum, GfxState *state, double crop_x1, double crop_y1, double crop_x2, double crop_y2)
 {
     double x1,y1,x2,y2;
@@ -67,6 +86,9 @@ 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++;
@@ -88,7 +110,11 @@ char*getFontID(GfxFont*font)
     char* fname = gstr==0?0:gstr->getCString();
     char buf[128];
     if(fname==0) {
-	sprintf(buf, "font-%d-%d", ref->num, ref->gen);
+	if(font->getType() == fontType3) {
+	    sprintf(buf, "t3font-%d-%d", ref->num, ref->gen);
+	} else {
+	    sprintf(buf, "font-%d-%d", ref->num, ref->gen);
+	}
     } else {
 	sprintf(buf, "%s-%d-%d", fname, ref->num, ref->gen);
     }
@@ -98,45 +124,48 @@ 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;
+	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();
-    info->num_glyphs = 0;
-    info->glyphs = 0;
-
-    if(!info->splash_font) {
-	delete info;
-	return;
-    }
- 
-    GString* idStr = new GString(id);
-    id2font->add(idStr, (void*)info);
-    num_fonts++;
-    currentfont = info;
+    currentfont->splash_font = splash->getCurrentFont();
     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);
@@ -154,14 +183,13 @@ 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;
     }
-    if(code >= currentfont->num_glyphs) {
-	currentfont->glyphs = (GlyphInfo**)realloc(currentfont->glyphs, sizeof(GlyphInfo*)*(code+1));
-	memset(&currentfont->glyphs[currentfont->num_glyphs], 0, sizeof(SplashPath*)*((code+1)-currentfont->num_glyphs));
-	currentfont->num_glyphs = code+1;
-    }
+    currentfont->grow(code+1);
     GlyphInfo*g = currentfont->glyphs[code];
     if(!g) {
 	g = currentfont->glyphs[code] = new GlyphInfo();
@@ -173,6 +201,71 @@ void InfoOutputDev::drawChar(GfxState *state, double x, double y,
     }
 
 }
+
+GBool InfoOutputDev::beginType3Char(GfxState *state, double x, double y, double dx, double dy, CharCode code, Unicode *u, int uLen)
+{
+    GfxFont*font = state->getFont();
+    if(!font)
+	return gTrue;
+    if(font->getType() != fontType3)
+	return gTrue;
+
+    char*id = getFontID(font);
+    currentfont = (FontInfo*)id2font->lookup(id);
+    if(!currentfont) {
+	currentfont = new FontInfo;
+	currentfont->font = font;
+	GString* idStr = new GString(id);
+	id2font->add(idStr, (void*)currentfont);
+	num_fonts++;
+    }
+    currentfont = currentfont;
+    free(id);
+
+    currentfont->grow(code+1);
+    if(!currentfont->glyphs[code]) {
+	currentglyph = currentfont->glyphs[code] = new GlyphInfo();
+	currentglyph->unicode = uLen?u[0]:0;
+	currentglyph->path = new SplashPath();
+	currentglyph->x1=0;
+	currentglyph->y1=0;
+	currentglyph->x2=dx;
+	currentglyph->y2=dy;
+	return gFalse;
+    } else {
+	return gTrue;
+    }
+}
+
+void InfoOutputDev::type3D0(GfxState *state, double wx, double wy)
+{
+    currentglyph->x1=0;
+    currentglyph->y1=0;
+    currentglyph->x2=wx;
+    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->x2=urx;
+    currentglyph->y2=ury;
+}
+
+void InfoOutputDev::endType3Char(GfxState *state)
+{
+    double x1 = currentglyph->x1;
+    double y1 = currentglyph->y1;
+    double x2 = currentglyph->x2;
+    double y2 = currentglyph->y2;
+    currentglyph->path->moveTo(x1,y1);
+    currentglyph->path->lineTo(x2,y1);
+    currentglyph->path->lineTo(x2,y2);
+    currentglyph->path->lineTo(x1,y2);
+    currentglyph->path->close();
+}
+
 void InfoOutputDev::drawImageMask(GfxState *state, Object *ref, Stream *str,
 			   int width, int height, GBool invert,
 			   GBool inlineImg)