From af43e2a5714a70b9a65285cbf00e290d95d957a5 Mon Sep 17 00:00:00 2001 From: kramm Date: Sat, 10 Sep 2005 12:31:35 +0000 Subject: [PATCH] * fix for fileVersion and protect parameters * linewidth is now always rounded up --- pdf2swf/swfoutput.cc | 30 ++++++++++++++++++++++++------ 1 file changed, 24 insertions(+), 6 deletions(-) diff --git a/pdf2swf/swfoutput.cc b/pdf2swf/swfoutput.cc index a386b64..3861be7 100644 --- a/pdf2swf/swfoutput.cc +++ b/pdf2swf/swfoutput.cc @@ -1148,8 +1148,10 @@ void swfoutput_finalize(gfxdevice_t*dev) TAG*mtag = i->swf->firstTag; if(iterator->swffont) { mtag = swf_InsertTag(mtag, ST_DEFINEFONT2); - if(!i->config_storeallcharacters) + if(!i->config_storeallcharacters) { + msg(" Reducing font %s", iterator->swffont->name); swf_FontReduce(iterator->swffont); + } swf_FontSetDefine2(mtag, iterator->swffont); } @@ -1306,12 +1308,11 @@ static void swfoutput_setstrokecolor(gfxdevice_t* dev, U8 r, U8 g, U8 b, U8 a) static void swfoutput_setlinewidth(gfxdevice_t*dev, double _linewidth) { swfoutput_internal*i = (swfoutput_internal*)dev->internal; - if(i->linewidth == (U16)(_linewidth*20)) + if(i->linewidth == (U16)(_linewidth*20+19)) return; - if(i->shapeid>=0) endshape(dev); - i->linewidth = (U16)(_linewidth*20); + i->linewidth = (U16)(_linewidth*20+19); } @@ -1652,12 +1653,18 @@ int swf_setparameter(gfxdevice_t*dev, const char*name, const char*value) i->config_bboxvars = atoi(value); } else if(!strcmp(name, "insertstop")) { i->config_insertstoptag = atoi(value); - } else if(!strcmp(name, "protected")) { + } else if(!strcmp(name, "protect")) { i->config_protect = atoi(value); + if(i->config_protect && i->tag) { + i->tag = swf_InsertTag(i->tag, ST_PROTECT); + } } else if(!strcmp(name, "faketags")) { i->config_generate_fake_tags = atoi(value); } else if(!strcmp(name, "flashversion")) { i->config_flashversion = atoi(value); + if(i->swf) { + i->swf->fileVersion = i->config_flashversion; + } } else if(!strcmp(name, "minlinewidth")) { i->config_minlinewidth = atof(value); } else if(!strcmp(name, "caplinewidth")) { @@ -2162,7 +2169,7 @@ gfxline_t* gfxline_move(gfxline_t*line, double x, double y) return line; } -#define NORMALIZE_POLYGON_POSITIONS +//#define NORMALIZE_POLYGON_POSITIONS static void swf_stroke(gfxdevice_t*dev, gfxline_t*line, gfxcoord_t width, gfxcolor_t*color, gfx_capType cap_style, gfx_joinType joint_style, gfxcoord_t miterLimit) { @@ -2403,5 +2410,16 @@ static void swf_drawchar(gfxdevice_t*dev, char*fontid, int glyph, gfxcolor_t*col m.m22 = i->fontm22; m.m31 = matrix->tx; m.m32 = matrix->ty; + +/* printf("%f %f\n", m.m31, m.m32); + { + static int xpos = 40; + static int ypos = 200; + m.m31 = xpos; + m.m32 = ypos; + xpos += 10; + }*/ + + drawchar(dev, i->swffont, glyph, &m, color); } -- 1.7.10.4