X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=pdf2swf%2FSWFOutputDev.cc;h=0b7933642beea86bd75bec7f20d8bc2b492dd19d;hb=55675b798f2079ce195a300c965c43178fe06064;hp=0b06f8d0dd1c5815167f678623ceef2577d49f5c;hpb=94daae2b7b14dc8d1da4697c775c9c4726f54b31;p=swftools.git diff --git a/pdf2swf/SWFOutputDev.cc b/pdf2swf/SWFOutputDev.cc index 0b06f8d..0b79336 100644 --- a/pdf2swf/SWFOutputDev.cc +++ b/pdf2swf/SWFOutputDev.cc @@ -74,6 +74,7 @@ static int pagebuflen = 0; static int pagepos = 0; static double caplinewidth = 3.0; +static int zoom = 72; /* xpdf: 86 */ static void printInfoString(Dict *infoDict, char *key, char *fmt); static void printInfoDate(Dict *infoDict, char *key, char *fmt); @@ -673,7 +674,7 @@ void SWFOutputDev::drawChar(GfxState *state, double x, double y, x1 = x; y1 = y; state->transform(x, y, &x1, &y1); - + Unicode u=0; if(_u) u = *_u; @@ -700,9 +701,9 @@ void SWFOutputDev::drawChar(GfxState *state, double x, double y, msg(" drawChar(%f,%f,c='%c' (%d),u=%d <%d>) CID=%d name=\"%s\"\n",x,y,(c&127)>=32?c:'?',c,u, uLen, font->isCIDFont(), FIXNULL(name)); - x1 = (int)(x1+0.5); - y1 = (int)(y1+0.5); - + /*x1 = (int)(x1+0.5); + y1 = (int)(y1+0.5);*/ + int ret = swfoutput_drawchar(&output, x1, y1, name, c, u); } @@ -1779,6 +1780,8 @@ void pdfswf_setparameter(char*name, char*value) swffilename = value; } else if(!strcmp(name, "caplinewidth")) { caplinewidth = atof(value); + } else if(!strcmp(name, "zoom")) { + zoom = atoi(value); } else { swfoutput_setparameter(name, value); } @@ -1792,26 +1795,7 @@ void pdfswf_addfont(char*filename) fonts[fontnum++] = f; } -/* TODO: get rid of this */ -void pdfswf_drawonlyshapes() { pdfswf_setparameter("drawonlyshapes", "1"); } -void pdfswf_ignoredraworder() { pdfswf_setparameter("ignoredraworder", "1"); } -void pdfswf_linksopennewwindow() { pdfswf_setparameter("opennewwindow", "1"); } -void pdfswf_storeallcharacters() { pdfswf_setparameter("storeallcharacters", "1"); } -void pdfswf_enablezlib() { pdfswf_setparameter("enablezlib", "1"); } void pdfswf_setoutputfilename(char*_filename) { swffilename = _filename; } -void pdfswf_insertstop() { pdfswf_setparameter("insertstoptag", "1"); } -void pdfswf_jpegquality(int val) { - char tmp[32]; - sprintf(tmp, "%d", val); - pdfswf_setparameter("jpegquality", tmp); -} -void pdfswf_setversion(int n) { - char tmp[32]; - sprintf(tmp, "%d", n); - pdfswf_setparameter("flashversion", tmp); -} - - void pdfswf_convertpage(int page) { @@ -1835,7 +1819,7 @@ void pdfswf_performconversion() for(t=0;tdisplayPage((OutputDev*)output, currentpage, /*dpi*/72, /*rotate*/0, /*doLinks*/(int)1); + doc->displayPage((OutputDev*)output, currentpage, /*zoom*/zoom, /*rotate*/0, /*doLinks*/(int)1); } } int pdfswf_numpages()