From: Matthias Kramm Date: Thu, 22 Jan 2009 00:06:54 +0000 (-0800) Subject: make sure gfxfonts are only created once X-Git-Tag: release-0-9-0~227 X-Git-Url: http://git.asbjorn.it/?a=commitdiff_plain;h=cdcf434411b35bb57bc3de9dffa6314d6ac70d5f;p=swftools.git make sure gfxfonts are only created once --- diff --git a/lib/pdf/GFXOutputDev.cc b/lib/pdf/GFXOutputDev.cc index def11a6..2b0e892 100644 --- a/lib/pdf/GFXOutputDev.cc +++ b/lib/pdf/GFXOutputDev.cc @@ -579,6 +579,7 @@ GFXOutputDev::GFXOutputDev(InfoOutputDev*info, PDFDoc*doc) this->user_clipy1 = 0; this->user_clipx2 = 0; this->user_clipy2 = 0; + this->current_fontinfo = 0; this->current_text_stroke = 0; this->current_text_clip = 0; this->outer_clip_box = 0; @@ -762,6 +763,13 @@ static void dumpFontInfo(const char*loglevel, GfxFont*font) void dump_outline(gfxline_t*line) { + /*gfxbbox_t*r = gfxline_isrectangle(line); + if(!r) + printf("is not a rectangle\n"); + else + printf("is a rectangle: (%f,%f)-(%f-%f)\n", r->xmin, r->ymin, r->xmax, r->ymax); + */ + while(line) { if(line->type == gfx_moveTo) { msg(" | moveTo %.2f %.2f", line->x,line->y); @@ -1882,6 +1890,7 @@ void GFXOutputDev::updateFont(GfxState *state) } this->current_fontinfo = this->info->getFont(id); + if(!this->current_fontinfo) { msg(" Internal Error: no fontinfo for font %s", id); return; @@ -1890,7 +1899,7 @@ void GFXOutputDev::updateFont(GfxState *state) dumpFontInfo("", gfxFont); } - current_gfxfont = this->current_fontinfo->gfxfont; + current_gfxfont = this->current_fontinfo->getGfxFont(); device->addfont(device, current_gfxfont); free(id); diff --git a/lib/pdf/InfoOutputDev.cc b/lib/pdf/InfoOutputDev.cc index a20eac2..8a00d98 100644 --- a/lib/pdf/InfoOutputDev.cc +++ b/lib/pdf/InfoOutputDev.cc @@ -17,14 +17,18 @@ #include "../log.h" #include +/* 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_jpeg_images = 0; num_ppm_images = 0; + num_textfields = 0; num_fonts = 0; num_polygons= 0; - fonts = 0; currentfont = 0; currentglyph = 0; id2font = new GHash(1); @@ -54,8 +58,9 @@ 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; @@ -68,6 +73,7 @@ FontInfo::FontInfo() } FontInfo::~FontInfo() { + if(this->id) {free(this->id);this->id=0;} this->font = 0; if(this->charid2glyph) { free(this->charid2glyph); @@ -83,46 +89,8 @@ FontInfo::~FontInfo() } 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; - state->transform(crop_x1,crop_y1,&x1,&y1); - state->transform(crop_x2,crop_y2,&x2,&y2); - if(x2x1 = (int)x1; - this->y1 = (int)y1; - this->x2 = (int)x2; - this->y2 = (int)y2; - msg(" Generating info structure for page %d", pageNum); -} -void InfoOutputDev::endPage() -{ -} -void InfoOutputDev::drawLink(Link *link, Catalog *catalog) -{ - num_links++; -} - -/* there's not yet a way to set this */ -int config_fontquality = 10; -int config_bigchar = 0; -/* } 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); - } - */ - -gfxfont_t* InfoOutputDev::createGfxFont(GfxFont*xpdffont, FontInfo*src) +gfxfont_t* createGfxFont(FontInfo*src) { gfxfont_t*font = (gfxfont_t*)malloc(sizeof(gfxfont_t)); memset(font, 0, sizeof(gfxfont_t)); @@ -206,10 +174,54 @@ gfxfont_t* InfoOutputDev::createGfxFont(GfxFont*xpdffont, FontInfo*src) } } - //msg(" %d glyphs.", t, font->num_glyphs); 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;} +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; + state->transform(crop_x1,crop_y1,&x1,&y1); + state->transform(crop_x2,crop_y2,&x2,&y2); + if(x2x1 = (int)x1; + this->y1 = (int)y1; + this->x2 = (int)x2; + this->y2 = (int)y2; + msg(" 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); @@ -256,7 +268,7 @@ void InfoOutputDev::updateFont(GfxState *state) currentfont = (FontInfo*)id2font->lookup(id); if(!currentfont) { - currentfont = new FontInfo; + currentfont = new FontInfo(id); currentfont->font = font; currentfont->max_size = 0; GString* idStr = new GString(id); @@ -277,10 +289,6 @@ void InfoOutputDev::updateFont(GfxState *state) currentfont->ascender = currentfont->descender = 0; } - currentfont->gfxfont = this->createGfxFont(font, currentfont); - currentfont->gfxfont->id = strdup(id); - fonts = gfxfontlist_addfont(fonts, currentfont->gfxfont); - free(id); } @@ -317,6 +325,9 @@ void InfoOutputDev::drawChar(GfxState *state, double x, double y, if(currentfont && currentfont->max_size < len) { currentfont->max_size = len; } + + num_textfields++; + currentfont->grow(code+1); GlyphInfo*g = currentfont->glyphs[code]; if(!g) { @@ -353,7 +364,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); @@ -445,3 +456,14 @@ void InfoOutputDev::drawSoftMaskedImage(GfxState *state, Object *ref, Stream *st 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()); + } +} diff --git a/lib/pdf/InfoOutputDev.h b/lib/pdf/InfoOutputDev.h index 532e2ed..68b036f 100644 --- a/lib/pdf/InfoOutputDev.h +++ b/lib/pdf/InfoOutputDev.h @@ -58,11 +58,17 @@ struct GlyphInfo 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; @@ -70,7 +76,6 @@ struct FontInfo void grow(int size); - gfxfont_t*gfxfont; GfxFont*font; double max_size; int num_glyphs; @@ -89,8 +94,6 @@ class InfoOutputDev: public OutputDev GlyphInfo* currentglyph; SplashOutputDev*splash; - gfxfont_t* createGfxFont(GfxFont*xpdffont, FontInfo*src); - public: int x1,y1,x2,y2; int num_links; @@ -100,7 +103,8 @@ class InfoOutputDev: public OutputDev int num_polygons; int num_textfields; - gfxfontlist_t*fonts; + void finish(); + void dumpfonts(gfxdevice_t*dev); InfoOutputDev(XRef*xref); virtual ~InfoOutputDev(); @@ -144,6 +148,7 @@ class InfoOutputDev: public OutputDev Stream *maskStr, int maskWidth, int maskHeight, GfxImageColorMap *maskColorMap); + virtual FontInfo* getFont(char*id); };