X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=lib%2Fpdf%2FInfoOutputDev.cc;h=75644bcf4a980c6dd2b03948fa6856a819f7f314;hb=35d1f904be07a3edfd388dd563f1142609aa6d3c;hp=a10f4bd2e0272469f506943533759c0879328a10;hpb=fa4fec76390c6ff0fc041a83bff0edb475ea7d78;p=swftools.git diff --git a/lib/pdf/InfoOutputDev.cc b/lib/pdf/InfoOutputDev.cc index a10f4bd..75644bc 100644 --- a/lib/pdf/InfoOutputDev.cc +++ b/lib/pdf/InfoOutputDev.cc @@ -17,10 +17,16 @@ #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_images = 0; + num_jpeg_images = 0; + num_ppm_images = 0; + num_textfields = 0; num_fonts = 0; num_polygons= 0; currentfont = 0; @@ -52,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; @@ -62,9 +69,11 @@ FontInfo::FontInfo() 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); @@ -79,7 +88,107 @@ FontInfo::~FontInfo() } } 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;tnum_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;sgetPoint(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(" 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;tnum_glyphs;t++) { + if(font->glyphs[t].unicode>0 && font->glyphs[t].unicodemax_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;} @@ -105,6 +214,16 @@ 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); @@ -151,7 +270,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); @@ -165,8 +284,13 @@ 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; + if(currentfont->splash_font) { + currentfont->ascender = currentfont->splash_font->ascender; + currentfont->descender = currentfont->splash_font->descender; + } else { + currentfont->ascender = currentfont->descender = 0; + } + free(id); } @@ -203,6 +327,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) { @@ -239,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); @@ -296,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, @@ -313,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); } @@ -323,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()); + } +}