X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=lib%2Fdevices%2Fswf.c;h=b12f27baaa06130ceee9e0070d5b428d0f906152;hb=66f6d2a40bed5716c469f0e2c8de1cc13e0022a2;hp=4e623b0a2161b3ad7e8da2794535bec681bf4ffd;hpb=c4bf7f42ef038c285b5a53f0a43f68f5c7f339e6;p=swftools.git diff --git a/lib/devices/swf.c b/lib/devices/swf.c index 4e623b0..b12f27b 100644 --- a/lib/devices/swf.c +++ b/lib/devices/swf.c @@ -35,6 +35,7 @@ #include "../gfxdevice.h" #include "../gfxtools.h" #include "../art/libart.h" +#include "artsutils.c" #define CHARDATAMAX 8192 #define CHARMIDX 0 @@ -77,15 +78,19 @@ typedef struct _swfoutput_internal int config_enablezlib; int config_insertstoptag; int config_flashversion; + int config_reordertags; int config_splinemaxerror; int config_fontsplinemaxerror; int config_filloverlap; int config_protect; int config_bboxvars; + int config_disable_polygon_conversion; RGBA config_linkcolor; float config_minlinewidth; double config_caplinewidth; char* config_linktarget; + char*config_internallinkfunction; + char*config_externallinkfunction; SWF* swf; @@ -154,6 +159,8 @@ typedef struct _swfoutput_internal int shapeposx; int shapeposy; + char* mark; + } swfoutput_internal; static void swf_fillbitmap(gfxdevice_t*driver, gfxline_t*line, gfximage_t*img, gfxmatrix_t*move, gfxcxform_t*cxform); @@ -165,8 +172,8 @@ static void swf_stroke(gfxdevice_t*dev, gfxline_t*line, gfxcoord_t width, gfxcol static void swf_fill(gfxdevice_t*dev, gfxline_t*line, gfxcolor_t*color); static void swf_fillbitmap(gfxdevice_t*dev, gfxline_t*line, gfximage_t*img, gfxmatrix_t*matrix, gfxcxform_t*cxform); static void swf_fillgradient(gfxdevice_t*dev, gfxline_t*line, gfxgradient_t*gradient, gfxgradienttype_t type, gfxmatrix_t*matrix); -static void swf_drawchar(gfxdevice_t*dev, char*fontid, int glyph, gfxcolor_t*color, gfxmatrix_t*matrix); -static void swf_addfont(gfxdevice_t*dev, char*fontid, gfxfont_t*font); +static void swf_drawchar(gfxdevice_t*dev, gfxfont_t*font, int glyph, gfxcolor_t*color, gfxmatrix_t*matrix); +static void swf_addfont(gfxdevice_t*dev, gfxfont_t*font); static void swf_drawlink(gfxdevice_t*dev, gfxline_t*line, char*action); static void swf_startframe(gfxdevice_t*dev, int width, int height); static void swf_endframe(gfxdevice_t*dev); @@ -188,6 +195,8 @@ static swfoutput_internal* init_internal_struct() i->frameno = 0; i->lastframeno = 0; + i->mark = 0; + i->fillstyleid; i->linestyleid; i->swflastx=0; @@ -224,6 +233,9 @@ static swfoutput_internal* init_internal_struct() i->config_minlinewidth=0.05; i->config_caplinewidth=1; i->config_linktarget=0; + i->config_internallinkfunction=0; + i->config_externallinkfunction=0; + i->config_reordertags=1; i->config_linkcolor.r = i->config_linkcolor.g = i->config_linkcolor.b = 255; i->config_linkcolor.a = 0x40; @@ -237,10 +249,13 @@ static U16 getNewID(gfxdevice_t* dev) { swfoutput_internal*i = (swfoutput_internal*)dev->internal; if(i->currentswfid == 65535) { - if(!id_error) + if(!id_error) { msg(" ID Table overflow"); + msg(" This file is too complex to render- SWF only supports 65536 shapes at once"); + } id_error=1; i->overflow = 1; + exit(1); } return ++i->currentswfid; } @@ -248,10 +263,13 @@ static U16 getNewDepth(gfxdevice_t* dev) { swfoutput_internal*i = (swfoutput_internal*)dev->internal; if(i->depth == 65535) { - if(!id_error) + if(!id_error) { msg(" Depth Table overflow"); + msg(" This file is too complex to render- SWF only supports 65536 shapes at once"); + } id_error=1; i->overflow = 1; + exit(1); } return ++i->depth; } @@ -375,15 +393,18 @@ static void splineto(gfxdevice_t*dev, TAG*tag, plotxy_t control,plotxy_t end) i->swflastx += ex; i->swflasty += ey; - if(cx || cy || ex || ey) { - swf_ShapeSetCurve(tag, i->shape, cx,cy,ex,ey); - addPointToBBox(dev, lastlastx ,lastlasty ); - addPointToBBox(dev, lastlastx+cx,lastlasty+cy); - addPointToBBox(dev, lastlastx+cx+ex,lastlasty+cy+ey); - }/* else if(!i->fill) { - // treat splines of length 0 as plots - plot(dev, lastlastx, lastlasty, tag); - }*/ + if((cx || cy) && (ex || ey)) { + swf_ShapeSetCurve(tag, i->shape, cx,cy,ex,ey); + addPointToBBox(dev, lastlastx ,lastlasty ); + addPointToBBox(dev, lastlastx+cx,lastlasty+cy); + addPointToBBox(dev, lastlastx+cx+ex,lastlasty+cy+ey); + } else if(cx || cy || ex || ey) { + swf_ShapeSetLine(tag, i->shape, cx+ex,cy+ey); + addPointToBBox(dev, lastlastx ,lastlasty ); + addPointToBBox(dev, lastlastx+cx,lastlasty+cy); + addPointToBBox(dev, lastlastx+cx+ex,lastlasty+cy+ey); + } + i->shapeisempty = 0; } @@ -405,7 +426,7 @@ void resetdrawer(gfxdevice_t*dev) static void stopFill(gfxdevice_t*dev) { swfoutput_internal*i = (swfoutput_internal*)dev->internal; - if(i->lastwasfill) + if(i->lastwasfill!=0) { swf_ShapeSetStyle(i->tag,i->shape,i->linestyleid,0x8000,0); i->fillstylechanged = 1; @@ -415,7 +436,7 @@ static void stopFill(gfxdevice_t*dev) static void startFill(gfxdevice_t*dev) { swfoutput_internal*i = (swfoutput_internal*)dev->internal; - if(!i->lastwasfill) + if(i->lastwasfill!=1) { swf_ShapeSetStyle(i->tag,i->shape,0x8000,i->fillstyleid,0); i->fillstylechanged = 1; @@ -719,6 +740,18 @@ static void endtext(gfxdevice_t*dev) putcharacters(dev, i->tag); swf_SetU8(i->tag,0); + + if(i->swf->fileVersion >= 8) { + i->tag = swf_InsertTag(i->tag, ST_CSMTEXTSETTINGS); + swf_SetU16(i->tag, i->textid); + //swf_SetU8(i->tag, /*subpixel grid*/(2<<3)|/*flashtype*/0x40); + //swf_SetU8(i->tag, /*grid*/(1<<3)|/*flashtype*/0x40); + //swf_SetU8(i->tag, /*grid*/(0<<3)|/*flashtype*/0x40); + swf_SetU8(i->tag, /*grid*/(1<<3)|/*no flashtype*/0x00); + swf_SetU32(i->tag, 0);//thickness + swf_SetU32(i->tag, 0);//sharpness + swf_SetU8(i->tag, 0);//reserved + } i->tag = swf_InsertTag(i->tag,ST_PLACEOBJECT2); swf_ObjectPlace(i->tag,i->textid,getNewDepth(dev),&i->page_matrix,NULL,NULL); @@ -858,6 +891,9 @@ static void setBackground(gfxdevice_t*dev, int x1, int y1, int x2, int y2) void gfxdevice_swf_init(gfxdevice_t* dev) { memset(dev, 0, sizeof(gfxdevice_t)); + + dev->name = "swf"; + dev->internal = init_internal_struct(); dev->startpage = swf_startframe; @@ -915,11 +951,15 @@ static void startshape(gfxdevice_t*dev) if(i->textid>=0) endtext(dev); - i->tag = swf_InsertTag(i->tag,ST_DEFINESHAPE); + i->tag = swf_InsertTag(i->tag,ST_DEFINESHAPE3); swf_ShapeNew(&i->shape); i->linestyleid = swf_ShapeAddLineStyle(i->shape,i->linewidth,&i->strokergb); i->fillstyleid = swf_ShapeAddSolidFillStyle(i->shape,&i->fillrgb); + if(i->mark) { + RGBA markcol = {0,i->mark[0],i->mark[1],i->mark[2]}; + swf_ShapeAddSolidFillStyle(i->shape,&markcol); + } i->shapeid = getNewID(dev); @@ -942,9 +982,10 @@ static void startshape(gfxdevice_t*dev) swf_SetShapeBits(i->tag,i->shape); /* TODO: do we really need this? */ - swf_ShapeSetAll(i->tag,i->shape,/*x*/0,/*y*/0,i->linestyleid,0,0); - i->swflastx=i->swflasty=0; - i->lastwasfill = 0; + //swf_ShapeSetAll(i->tag,i->shape,/*x*/0,/*y*/0,i->linestyleid,0,0); + //swf_ShapeSetAll(i->tag,i->shape,/*x*/UNDEFINED_COORD,/*y*/UNDEFINED_COORD,i->linestyleid,0,0); + i->swflastx=i->swflasty=UNDEFINED_COORD; + i->lastwasfill = -1; i->shapeisempty = 1; } @@ -993,6 +1034,8 @@ void cancelshape(gfxdevice_t*dev) if(i->shape) {swf_ShapeFree(i->shape);i->shape=0;} i->shapeid = -1; i->bboxrectpos = -1; + +// i->currentswfid--; // this was an *exceptionally* bad idea } void fixAreas(gfxdevice_t*dev) @@ -1025,6 +1068,7 @@ void fixAreas(gfxdevice_t*dev) if(i->linewidth==0) i->linewidth = 1; startshape(dev); + stopFill(dev); moveto(dev, i->tag, r.xmin/20.0,r.ymin/20.0); lineto(dev, i->tag, r.xmax/20.0,r.ymax/20.0); @@ -1149,17 +1193,24 @@ void swfoutput_finalize(gfxdevice_t*dev) if(i->frameno == i->lastframeno) // fix: add missing pagefeed dev->endpage(dev); + if(i->mark) { + free(i->mark);i->mark = 0; + } + endpage(dev); fontlist_t *tmp,*iterator = i->fontlist; while(iterator) { TAG*mtag = i->swf->firstTag; if(iterator->swffont) { - mtag = swf_InsertTag(mtag, ST_DEFINEFONT2); if(!i->config_storeallcharacters) { msg(" Reducing font %s", iterator->swffont->name); swf_FontReduce(iterator->swffont); } - swf_FontSetDefine2(mtag, iterator->swffont); + int used = iterator->swffont->use && iterator->swffont->use->used_glyphs; + if(i->config_storeallcharacters || used) { + mtag = swf_InsertTag(mtag, ST_DEFINEFONT2); + swf_FontSetDefine2(mtag, iterator->swffont); + } } iterator = iterator->next; @@ -1181,6 +1232,9 @@ void swfoutput_finalize(gfxdevice_t*dev) if(i->config_enablezlib || i->config_flashversion>=6) { i->swf->compressed = 1; } + + if(i->config_reordertags) + swf_Optimize(i->swf); } int swfresult_save(gfxresult_t*gfx, char*filename) @@ -1364,7 +1418,7 @@ void swf_drawlink(gfxdevice_t*dev, gfxline_t*points, char*url) if(url[t]<'0' || url[t]>'9') nodigit = 1; if(!nodigit) { - int page = atoi(&url[4]) - 1; + int page = atoi(&url[4]); if(page<0) page = 0; swfoutput_linktopage(dev, page, points); } @@ -1374,20 +1428,25 @@ void swf_drawlink(gfxdevice_t*dev, gfxline_t*points, char*url) } void swfoutput_linktourl(gfxdevice_t*dev, char*url, gfxline_t*points) { - ActionTAG* actions; + ActionTAG* actions = 0; swfoutput_internal*i = (swfoutput_internal*)dev->internal; if(i->shapeid>=0) endshape(dev); if(i->textid>=0) endtext(dev); - - if(!i->config_linktarget) { + + if(i->config_externallinkfunction) { + actions = action_PushString(actions, url); //parameter + actions = action_PushInt(actions, 1); //number of parameters (1) + actions = action_PushString(actions, i->config_externallinkfunction); //function name + actions = action_CallFunction(actions); + } else if(!i->config_linktarget) { if(!i->config_opennewwindow) - actions = action_GetUrl(0, url, "_parent"); + actions = action_GetUrl(actions, url, "_parent"); else - actions = action_GetUrl(0, url, "_this"); + actions = action_GetUrl(actions, url, "_this"); } else { - actions = action_GetUrl(0, url, i->config_linktarget); + actions = action_GetUrl(actions, url, i->config_linktarget); } actions = action_End(actions); @@ -1396,15 +1455,23 @@ void swfoutput_linktourl(gfxdevice_t*dev, char*url, gfxline_t*points) void swfoutput_linktopage(gfxdevice_t*dev, int page, gfxline_t*points) { swfoutput_internal*i = (swfoutput_internal*)dev->internal; - ActionTAG* actions; + ActionTAG* actions = 0; if(i->shapeid>=0) endshape(dev); if(i->textid>=0) endtext(dev); - - actions = action_GotoFrame(0, page); - actions = action_End(actions); + + if(!i->config_internallinkfunction) { + actions = action_GotoFrame(actions, page-1); + actions = action_End(actions); + } else { + actions = action_PushInt(actions, page); //parameter + actions = action_PushInt(actions, 1); //number of parameters (1) + actions = action_PushString(actions, i->config_internallinkfunction); //function name + actions = action_CallFunction(actions); + actions = action_End(actions); + } drawlink(dev, actions, 0, points,0); } @@ -1431,12 +1498,14 @@ void swfoutput_namedlink(gfxdevice_t*dev, char*name, gfxline_t*points) actions1 = action_PushInt(0, 0); //number of parameters (0) actions1 = action_PushString(actions1, &tmp[5]); //function name actions1 = action_CallFunction(actions1); + actions1 = action_End(actions1); } else { *x = 0; actions1 = action_PushString(0, x+1); //parameter actions1 = action_PushInt(actions1, 1); //number of parameters (1) actions1 = action_PushString(actions1, &tmp[5]); //function name actions1 = action_CallFunction(actions1); + actions1 = action_End(actions1); } actions2 = action_End(0); mouseover = 0; @@ -1466,24 +1535,23 @@ static void drawgfxline(gfxdevice_t*dev, gfxline_t*line) swfoutput_internal*i = (swfoutput_internal*)dev->internal; gfxcoord_t lastx=0,lasty=0,px=0,py=0; char lastwasmoveto; + int lines= 0, splines=0; while(1) { if(!line) break; /* check whether the next segment is zero */ if(line->type == gfx_moveTo) { - msg(" ======== moveTo %.2f %.2f", line->x, line->y); moveto(dev, i->tag, line->x, line->y); px = lastx = line->x; py = lasty = line->y; lastwasmoveto = 1; } if(line->type == gfx_lineTo) { - msg(" ======== lineTo %.2f %.2f", line->x, line->y); lineto(dev, i->tag, line->x, line->y); px = line->x; py = line->y; lastwasmoveto = 0; + lines++; } else if(line->type == gfx_splineTo) { - msg(" ======== splineTo %.2f %.2f", line->x, line->y); plotxy_t s,p; s.x = line->sx;p.x = line->x; s.y = line->sy;p.y = line->y; @@ -1491,9 +1559,11 @@ static void drawgfxline(gfxdevice_t*dev, gfxline_t*line) px = line->x; py = line->y; lastwasmoveto = 0; + splines++; } line = line->next; } + msg(" drawgfxline, %d lines, %d splines", lines, splines); } @@ -1655,6 +1725,7 @@ int swf_setparameter(gfxdevice_t*dev, const char*name, const char*value) { swfoutput_internal*i = (swfoutput_internal*)dev->internal; + msg(" swfdevice: %s=%s", name, value); if(!strcmp(name, "jpegsubpixels")) { i->config_jpegsubpixels = atof(value); } else if(!strcmp(name, "ppmsubpixels")) { @@ -1665,6 +1736,15 @@ int swf_setparameter(gfxdevice_t*dev, const char*name, const char*value) i->config_drawonlyshapes = atoi(value); } else if(!strcmp(name, "ignoredraworder")) { i->config_ignoredraworder = atoi(value); + } else if(!strcmp(name, "mark")) { + if(!value || !value[0]) { + if(i->mark) free(i->mark); + i->mark = 0; + } else { + int t; + i->mark = strdup("..."); + for(t=0;t<3;t++) if(value[t]) i->mark[t] = value[t]; + } } else if(!strcmp(name, "filloverlap")) { i->config_filloverlap = atoi(value); } else if(!strcmp(name, "linksopennewwindow")) { @@ -1677,6 +1757,14 @@ int swf_setparameter(gfxdevice_t*dev, const char*name, const char*value) i->config_enablezlib = atoi(value); } else if(!strcmp(name, "bboxvars")) { i->config_bboxvars = atoi(value); + } else if(!strcmp(name, "reordertags")) { + i->config_reordertags = atoi(value); + } else if(!strcmp(name, "internallinkfunction")) { + i->config_internallinkfunction = strdup(value); + } else if(!strcmp(name, "externallinkfunction")) { + i->config_externallinkfunction = strdup(value); + } else if(!strcmp(name, "disable_polygon_conversion")) { + i->config_disable_polygon_conversion = atoi(value); } else if(!strcmp(name, "insertstop")) { i->config_insertstoptag = atoi(value); } else if(!strcmp(name, "protect")) { @@ -1733,7 +1821,6 @@ int swf_setparameter(gfxdevice_t*dev, const char*name, const char*value) i->config_linkcolor.a); } else { - fprintf(stderr, "unknown parameter: %s (=%s)\n", name, value); return 0; } return 1; @@ -1764,129 +1851,6 @@ static CXFORM gfxcxform_to_cxform(gfxcxform_t* c) return cx; } -static ArtVpath* gfxline_to_ArtVpath(gfxline_t*line) -{ - ArtVpath *vec = NULL; - int pos=0,len=0; - gfxline_t*l2; - double x=0,y=0; - - /* factor which determines into how many line fragments a spline is converted */ - double subfraction = 2.4;//0.3 - - l2 = line; - while(l2) { - if(l2->type == gfx_moveTo) { - pos ++; - } if(l2->type == gfx_lineTo) { - pos ++; - } if(l2->type == gfx_splineTo) { - int parts = (int)(sqrt(fabs(l2->x-2*l2->sx+x) + fabs(l2->y-2*l2->sy+y))*subfraction); - if(!parts) parts = 1; - pos += parts + 1; - } - x = l2->x; - y = l2->y; - l2 = l2->next; - } - pos++; - len = pos; - - vec = art_new (ArtVpath, len); - - pos = 0; - l2 = line; - while(l2) { - if(l2->type == gfx_moveTo) { - vec[pos].code = ART_MOVETO; - vec[pos].x = l2->x; - vec[pos].y = l2->y; - pos++; - assert(pos<=len); - } else if(l2->type == gfx_lineTo) { - vec[pos].code = ART_LINETO; - vec[pos].x = l2->x; - vec[pos].y = l2->y; - pos++; - assert(pos<=len); - } else if(l2->type == gfx_splineTo) { - int i; - int parts = (int)(sqrt(fabs(l2->x-2*l2->sx+x) + fabs(l2->y-2*l2->sy+y))*subfraction); - if(!parts) parts = 1; - for(i=0;i<=parts;i++) { - double t = (double)i/(double)parts; - vec[pos].code = ART_LINETO; - vec[pos].x = l2->x*t*t + 2*l2->sx*t*(1-t) + x*(1-t)*(1-t); - vec[pos].y = l2->y*t*t + 2*l2->sy*t*(1-t) + y*(1-t)*(1-t); - pos++; - assert(pos<=len); - } - } - x = l2->x; - y = l2->y; - l2 = l2->next; - } - vec[pos].code = ART_END; - - return vec; -} - -static ArtSVP* gfxfillToSVP(gfxline_t*line) -{ - ArtVpath* vec = gfxline_to_ArtVpath(line); - ArtSVP *svp = art_svp_from_vpath(vec); - free(vec); - return svp; -} - -static ArtSVP* gfxstrokeToSVP(gfxline_t*line, gfxcoord_t width, gfx_capType cap_style, gfx_joinType joint_style, double miterLimit) -{ - ArtVpath* vec = gfxline_to_ArtVpath(line); - ArtSVP *svp = art_svp_vpath_stroke (vec, - (joint_style==gfx_joinMiter)?ART_PATH_STROKE_JOIN_MITER: - ((joint_style==gfx_joinRound)?ART_PATH_STROKE_JOIN_ROUND: - ((joint_style==gfx_joinBevel)?ART_PATH_STROKE_JOIN_BEVEL:ART_PATH_STROKE_JOIN_BEVEL)), - (cap_style==gfx_capButt)?ART_PATH_STROKE_CAP_BUTT: - ((cap_style==gfx_capRound)?ART_PATH_STROKE_CAP_ROUND: - ((cap_style==gfx_capSquare)?ART_PATH_STROKE_CAP_SQUARE:ART_PATH_STROKE_CAP_SQUARE)), - width, //line_width - miterLimit, //miter_limit - 0.05 //flatness - ); - free(vec); - return svp; -} - -static gfxline_t* SVPtogfxline(ArtSVP*svp) -{ - int size = 0; - int t; - int pos = 0; - for(t=0;tn_segs;t++) { - size += svp->segs[t].n_points + 1; - } - gfxline_t* lines = (gfxline_t*)rfx_alloc(sizeof(gfxline_t)*size); - - for(t=0;tn_segs;t++) { - ArtSVPSeg* seg = &svp->segs[t]; - int p; - for(p=0;pn_points;p++) { - lines[pos].type = p==0?gfx_moveTo:gfx_lineTo; - ArtPoint* point = &seg->points[p]; - lines[pos].x = point->x; - lines[pos].y = point->y; - lines[pos].next = &lines[pos+1]; - pos++; - } - } - if(pos) { - lines[pos-1].next = 0; - return lines; - } else { - return 0; - } -} - /* TODO */ static int imageInCache(gfxdevice_t*dev, void*data, int width, int height) { @@ -1938,10 +1902,10 @@ static int add_image(swfoutput_internal*i, gfximage_t*img, int targetwidth, int int num_colors = swf_ImageGetNumberOfPaletteEntries(mem,sizex,sizey,0); int has_alpha = swf_ImageHasAlpha(mem,sizex,sizey); - msg(" Drawing %dx%d %s%simage at size %dx%d (%dx%d), %s%d colors", + msg(" Drawing %dx%d %s%simage (id %d) at size %dx%d (%dx%d), %s%d colors", sizex, sizey, has_alpha?(has_alpha==2?"semi-transparent ":"transparent "):"", - is_jpeg?"jpeg-":"", + is_jpeg?"jpeg-":"", i->currentswfid+1, newsizex, newsizey, targetwidth, targetheight, /*newsizex, newsizey,*/ @@ -1985,9 +1949,22 @@ static SRECT gfxline_getSWFbbox(gfxline_t*line) return r; } +int line_is_empty(gfxline_t*line) +{ + while(line) { + if(line->type != gfx_moveTo) + return 0; + line = line->next; + } + return 1; +} + static void swf_fillbitmap(gfxdevice_t*dev, gfxline_t*line, gfximage_t*img, gfxmatrix_t*matrix, gfxcxform_t*cxform) { swfoutput_internal*i = (swfoutput_internal*)dev->internal; + + if(line_is_empty(line)) + return; endshape(dev); endtext(dev); @@ -2047,12 +2024,17 @@ static void swf_startclip(gfxdevice_t*dev, gfxline_t*line) } int myshapeid = getNewID(dev); - i->tag = swf_InsertTag(i->tag,ST_DEFINESHAPE); + i->tag = swf_InsertTag(i->tag,ST_DEFINESHAPE3); RGBA col; memset(&col, 0, sizeof(RGBA)); + col.a = 255; SHAPE*shape; swf_ShapeNew(&shape); int fsid = swf_ShapeAddSolidFillStyle(shape,&col); + if(i->mark) { + RGBA markcol = {0,i->mark[0],i->mark[1],i->mark[2]}; + swf_ShapeAddSolidFillStyle(shape,&markcol); + } swf_SetU16(i->tag,myshapeid); SRECT r = gfxline_getSWFbbox(line); swf_SetRect(i->tag,&r); @@ -2099,6 +2081,7 @@ static int gfxline_type(gfxline_t*line) int lines=0; int splines=0; int haszerosegments=0; + int length=0; while(line) { if(line->type == gfx_moveTo) { tmplines=0; @@ -2112,8 +2095,11 @@ static int gfxline_type(gfxline_t*line) if(tmpsplines>lines) splines=tmpsplines; } + length++; line = line->next; } + if(length>400) + return 5; if(lines==0 && splines==0) return 0; else if(lines==1 && splines==0) return 1; else if(lines==0 && splines==1) return 2; @@ -2124,12 +2110,24 @@ static int gfxline_type(gfxline_t*line) static int gfxline_has_dots(gfxline_t*line) { int tmplines=0; - double x,y; + double x=0,y=0; double dist = 0; int isline = 0; + int short_gap = 0; while(line) { if(line->type == gfx_moveTo) { - if(isline && dist < 1) { + /* test the length of the preceding line, and assume it is a dot if + it's length is less than 1.0. But *only* if there's a noticable + gap between the previous line and the next moveTo. (I've come + across a PDF where thousands of "dots" were stringed together, + forming a line) */ + int last_short_gap = short_gap; + if((fabs(line->x - x) + fabs(line->y - y)) < 1.0) { + short_gap = 1; + } else { + short_gap = 0; + } + if(isline && dist < 1 && !short_gap && !last_short_gap) { return 1; } dist = 0; @@ -2146,7 +2144,7 @@ static int gfxline_has_dots(gfxline_t*line) y = line->y; line = line->next; } - if(isline && dist < 1) { + if(isline && dist < 1 && !short_gap) { return 1; } return 0; @@ -2181,24 +2179,6 @@ static char is_inside_page(gfxdevice_t*dev, gfxcoord_t x, gfxcoord_t y) return 1; } -static void show_path(ArtSVP*path) -{ - int t; - printf("Segments: %d\n", path->n_segs); - for(t=0;tn_segs;t++) { - ArtSVPSeg* seg = &path->segs[t]; - printf("Segment %d: %d points, %s, BBox: (%f,%f,%f,%f)\n", - t, seg->n_points, seg->dir==0?"UP ":"DOWN", - seg->bbox.x0, seg->bbox.y0, seg->bbox.x1, seg->bbox.y1); - int p; - for(p=0;pn_points;p++) { - ArtPoint* point = &seg->points[p]; - printf(" (%f,%f)\n", point->x, point->y); - } - } - printf("\n"); -} - gfxline_t* gfxline_move(gfxline_t*line, double x, double y) { gfxline_t*l = line = gfxline_clone(line); @@ -2218,6 +2198,8 @@ gfxline_t* gfxline_move(gfxline_t*line, double x, double y) 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) { swfoutput_internal*i = (swfoutput_internal*)dev->internal; + if(line_is_empty(line)) + return; int type = gfxline_type(line); int has_dots = gfxline_has_dots(line); gfxbbox_t r = gfxline_getbbox(line); @@ -2225,10 +2207,11 @@ static void swf_stroke(gfxdevice_t*dev, gfxline_t*line, gfxcoord_t width, gfxcol /* TODO: * split line into segments, and perform this check for all segments */ - if(!has_dots && - (width <= i->config_caplinewidth + if(i->config_disable_polygon_conversion || type>=5 || + (!has_dots && + (width <= i->config_caplinewidth || (cap_style == gfx_capRound && joint_style == gfx_joinRound) - || (cap_style == gfx_capRound && type<=2))) {} else + || (cap_style == gfx_capRound && type<=2)))) {} else { /* convert line to polygon */ msg(" draw as polygon, type=%d dots=%d", type, has_dots); @@ -2272,6 +2255,10 @@ static void swf_stroke(gfxdevice_t*dev, gfxline_t*line, gfxcoord_t width, gfxcol static void swf_fill(gfxdevice_t*dev, gfxline_t*line, gfxcolor_t*color) { swfoutput_internal*i = (swfoutput_internal*)dev->internal; + if(line_is_empty(line)) + return; + if(!color->a) + return; gfxbbox_t r = gfxline_getbbox(line); int is_outside_page = !is_inside_page(dev, r.xmin, r.ymin) || !is_inside_page(dev, r.xmax, r.ymax); @@ -2304,6 +2291,8 @@ static void swf_fill(gfxdevice_t*dev, gfxline_t*line, gfxcolor_t*color) } static void swf_fillgradient(gfxdevice_t*dev, gfxline_t*line, gfxgradient_t*gradient, gfxgradienttype_t type, gfxmatrix_t*matrix) { + if(line_is_empty(line)) + return; msg(" Gradient filling not implemented yet"); } @@ -2333,13 +2322,14 @@ static SWFFONT* gfxfont_to_swffont(gfxfont_t*font, char* id) for(t=0;tnum_glyphs;t++) { drawer_t draw; gfxline_t*line; + int advance = 0; swffont->glyph2ascii[t] = font->glyphs[t].unicode; if(font->glyphs[t].name) { swffont->glyphnames[t] = strdup(font->glyphs[t].name); } else { swffont->glyphnames[t] = 0; } - swffont->glyph[t].advance = (int)(font->glyphs[t].advance * 20); + advance = (int)(font->glyphs[t].advance); swf_Shape01DrawerInit(&draw, 0); line = font->glyphs[t].line; @@ -2359,6 +2349,18 @@ static SWFFONT* gfxfont_to_swffont(gfxfont_t*font, char* id) draw.finish(&draw); swffont->glyph[t].shape = swf_ShapeDrawerToShape(&draw); swffont->layout->bounds[t] = swf_ShapeDrawerGetBBox(&draw); + + if(swffont->layout->bounds[t].xmax && swffont->layout->bounds[t].xmax*2 < advance) { + printf("fix bad advance value: bbox=%d, advance=%d (%f)\n", swffont->layout->bounds[t].xmax, advance, font->glyphs[t].advance); + advance = swffont->layout->bounds[t].xmax; + } + + if(advance<32768) { + swffont->glyph[t].advance = advance; + } else { + swffont->glyph[t].advance = 32767; + } + draw.dealloc(&draw); swf_ExpandRect2(&bounds, &swffont->layout->bounds[t]); @@ -2376,23 +2378,23 @@ static SWFFONT* gfxfont_to_swffont(gfxfont_t*font, char* id) return swffont; } -static void swf_addfont(gfxdevice_t*dev, char*fontid, gfxfont_t*font) +static void swf_addfont(gfxdevice_t*dev, gfxfont_t*font) { swfoutput_internal*i = (swfoutput_internal*)dev->internal; - if(i->swffont && i->swffont->name && !strcmp((char*)i->swffont->name,fontid)) + if(i->swffont && i->swffont->name && !strcmp((char*)i->swffont->name,font->id)) return; // the requested font is the current font fontlist_t*last=0,*l = i->fontlist; while(l) { last = l; - if(!strcmp((char*)l->swffont->name, fontid)) { + if(!strcmp((char*)l->swffont->name, font->id)) { return; // we already know this font } l = l->next; } l = (fontlist_t*)rfx_calloc(sizeof(fontlist_t)); - l->swffont = gfxfont_to_swffont(font, fontid); + l->swffont = gfxfont_to_swffont(font, font->id); l->next = 0; if(last) { last->next = l; @@ -2404,7 +2406,7 @@ static void swf_addfont(gfxdevice_t*dev, char*fontid, gfxfont_t*font) if(getScreenLogLevel() >= LOGLEVEL_DEBUG) { int iii; // print font information - msg(" Font %s",fontid); + msg(" Font %s",font->id); msg(" | ID: %d", l->swffont->id); msg(" | Version: %d", l->swffont->version); msg(" | Name: %s", l->swffont->name); @@ -2447,17 +2449,17 @@ static void swf_switchfont(gfxdevice_t*dev, char*fontid) return; } -static void swf_drawchar(gfxdevice_t*dev, char*fontid, int glyph, gfxcolor_t*color, gfxmatrix_t*matrix) +static void swf_drawchar(gfxdevice_t*dev, gfxfont_t*font, int glyph, gfxcolor_t*color, gfxmatrix_t*matrix) { swfoutput_internal*i = (swfoutput_internal*)dev->internal; - if(!i->swffont || !i->swffont->name || strcmp((char*)i->swffont->name,fontid)) // not equal to current font + if(!i->swffont || !i->swffont->name || strcmp((char*)i->swffont->name,font->id)) // not equal to current font { /* TODO: remove the need for this (enhance getcharacterbbox so that it can cope with multiple fonts */ endtext(dev); - swf_switchfont(dev, fontid); // set the current font + swf_switchfont(dev, font->id); // set the current font } swfoutput_setfontmatrix(dev, matrix->m00, matrix->m01, matrix->m10, matrix->m11);