#else
#include "FoFiType1C.h"
#include "FoFiTrueType.h"
+#include "GHash.h"
#endif
#include "SWFOutputDev.h"
_fontlist*next;
} fontlist_t;
+class InfoOutputDev;
+
class SWFOutputDev: public OutputDev {
public:
gfxdevice_t* output;
void setMove(int x,int y);
void setClip(int x1,int y1,int x2,int y2);
+
+ void setInfo(InfoOutputDev*info) {this->info = info;}
int save(char*filename);
void drawGeneralImage(GfxState *state, Object *ref, Stream *str,
int width, int height, GfxImageColorMap*colorMap, GBool invert,
GBool inlineImg, int mask, int *maskColors);
- int SWFOutputDev::setGfxFont(char*id, char*filename);
+ int SWFOutputDev::setGfxFont(char*id, char*filename, double quality);
void strokeGfxline(GfxState *state, gfxline_t*line);
void clipToGfxLine(GfxState *state, gfxline_t*line);
void fillGfxLine(GfxState *state, gfxline_t*line);
char outer_clip_box; //whether the page clip box is still on
+ InfoOutputDev*info;
SWFOutputState states[64];
int statepos;
static char*getFontID(GfxFont*font);
+struct FontInfo
+{
+ GfxFont*font;
+ double max_size;
+};
+
class InfoOutputDev: public OutputDev
{
+ GHash* id2font;
+ FontInfo* currentfont;
public:
int x1,y1,x2,y2;
int num_links;
num_links = 0;
num_images = 0;
num_fonts = 0;
+ id2font = new GHash();
}
virtual ~InfoOutputDev()
{
+ delete id2font;
}
virtual GBool upsideDown() {return gTrue;}
virtual GBool useDrawChar() {return gTrue;}
{
num_links++;
}
+ virtual double getMaximumFontSize(char*id)
+ {
+ FontInfo*info = (FontInfo*)id2font->lookup(id);
+ if(!info) {
+ msg("<error> Unknown font id: %s", id);
+ return 0.0;
+ }
+ return info->max_size;
+ }
+
virtual void updateFont(GfxState *state)
{
GfxFont*font = state->getFont();
if(!font)
return;
- /*char*id = getFontID(font);*/
- /* FIXME*/
- num_fonts++;
+ char*id = getFontID(font);
+
+ FontInfo*info = (FontInfo*)id2font->lookup(id);
+ if(!info) {
+ GString* idStr = new GString(id);
+ info = new FontInfo;
+ info->font = font;
+ info->max_size = 0;
+ id2font->add(idStr, (void*)info);
+ free(id);
+ num_fonts++;
+ }
+ currentfont = info;
+ }
+ virtual void drawChar(GfxState *state, double x, double y,
+ double dx, double dy,
+ double originX, double originY,
+ CharCode code, Unicode *u, int uLen)
+ {
+ int render = state->getRender();
+ if (render == 3)
+ return;
+ double m11,m21,m12,m22;
+ state->getFontTransMat(&m11, &m12, &m21, &m22);
+ m11 *= state->getHorizScaling();
+ m21 *= state->getHorizScaling();
+ double lenx = sqrt(m11*m11 + m12*m12);
+ double leny = sqrt(m21*m21 + m22*m22);
+ double len = lenx>leny?lenx:leny;
+ if(currentfont && currentfont->max_size < len) {
+ currentfont->max_size = len;
+ }
}
virtual void drawImageMask(GfxState *state, Object *ref, Stream *str,
int width, int height, GBool invert,
if(cpos==0) {
draw.lineTo(&draw, x,y);
} else {
- gfxdraw_cubicTo(&draw, bx,by, cx,cy, x,y);
+ gfxdraw_cubicTo(&draw, bx,by, cx,cy, x,y, 0.05);
}
needsfix = 1;
cpos = 0;
this->xref = xref;
}
-int SWFOutputDev::setGfxFont(char*id, char*filename)
+int SWFOutputDev::setGfxFont(char*id, char*filename, double maxSize)
{
gfxfont_t*font = 0;
fontlist_t*last=0,*l = this->fontlist;
l = l->next;
}
if(!filename) return 0;
- font = gfxfont_load(filename);
+
+ /* A font size of e.g. 9 means the font will be scaled down by
+ 1024 and scaled up by 9. So to have a maximum error of 1/20px,
+ we have to divide 0.05 by (fontsize/1024)
+ */
+ double quality = (1024 * 0.05) / maxSize;
+
+ font = gfxfont_load(filename, quality);
l = new fontlist_t;
l->font = font;
l->filename = strdup(filename);
return;
}
char * fontid = getFontID(gfxFont);
+ double maxSize = 1.0;
+
+ if(this->info) {
+ maxSize = this->info->getMaximumFontSize(fontid);
+ }
int t;
/* first, look if we substituted this font before-
/* second, see if this is a font which was used before-
if so, we are done */
- if(setGfxFont(fontid, 0)) {
+ if(setGfxFont(fontid, 0, 0)) {
free(fontid);
return;
}
return;
}
- msg("<verbose> updateFont(%s) -> %s", fontid, fileName);
+ msg("<verbose> updateFont(%s) -> %s (max size: %f)", fontid, fileName, maxSize);
dumpFontInfo("<verbose>", gfxFont);
//swfoutput_setfont(&output, fontid, fileName);
- if(!setGfxFont(fontid, 0)) {
- setGfxFont(fontid, fileName);
+ if(!setGfxFont(fontid, 0, 0)) {
+ setGfxFont(fontid, fileName, maxSize);
}
if(fileName && del)
{
int protect;
PDFDoc*doc;
+ InfoOutputDev*info;
} pdf_doc_internal_t;
typedef struct _pdf_page_internal
{
if(!i->doc->okToChange() || !i->doc->okToAddNotes())
i->protect = 1;
}
-
+
+ InfoOutputDev*io = new InfoOutputDev();
+ int t;
+ for(t=1;t<=pdf_doc->num_pages;t++) {
+#ifdef XPDF_101
+ i->doc->displayPage((OutputDev*)io, t, /*zoom*/zoom, /*rotate*/0, /*doLinks*/(int)1);
+#else
+ i->doc->displayPage((OutputDev*)io, t, zoom, zoom, /*rotate*/0, true, /*doLinks*/(int)1);
+#endif
+ }
+ i->info = io;
+
return pdf_doc;
}
free(pages); pages = 0; //FIXME
+ if(i->info) {
+ delete i->info;i->info=0;
+ }
+
free(pdf_doc->internal);pdf_doc->internal=0;
free(pdf_doc);pdf_doc=0;
}
pdf_doc_internal_t*pi = (pdf_doc_internal_t*)page->parent->internal;
swf_output_internal_t*si = (swf_output_internal_t*)swf->internal;
+ if(!pi) {
+ msg("<fatal> pdf_page_render: Parent PDF this page belongs to doesn't exist yet/anymore");
+ return;
+ }
+
if(pi->protect) {
gfxdevice_t*dev = si->outputDev->output;
dev->setparameter(dev, "protect", "1");
}
+ si->outputDev->setInfo(pi->info);
si->outputDev->setXRef(pi->doc, pi->doc->getXRef());
#ifdef XPDF_101
pi->doc->displayPage((OutputDev*)si->outputDev, page->nr, /*zoom*/zoom, /*rotate*/0, /*doLinks*/(int)1);
void pdf_page_info_destroy(pdf_page_info_t*info)
{
free(info);
+
}