X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=pdf2swf%2Fswfoutput.cc;h=5d1c10f7a94dfa9535e0017e9be2bb56dd180471;hb=5eb026e91bef063b683796fbbc03158d5711a4e4;hp=0e8b257bb781a5852d63fa634962763e3e58c60b;hpb=7bd5bed8d9e02b50dd068502d4e80658992482b1;p=swftools.git diff --git a/pdf2swf/swfoutput.cc b/pdf2swf/swfoutput.cc index 0e8b257..5d1c10f 100644 --- a/pdf2swf/swfoutput.cc +++ b/pdf2swf/swfoutput.cc @@ -44,9 +44,11 @@ int jpegquality=85; int storeallcharacters=0; int enablezlib=0; int insertstoptag=0; -int flashversion=4; +int flashversion=5; int splinemaxerror=1; int fontsplinemaxerror=1; +int filloverlap=0; +float minlinewidth=0.05; static char storefont = 0; static int flag_protected = 0; @@ -62,12 +64,13 @@ static TAG *tag; static int currentswfid = 0; static int depth = 1; static int startdepth = 1; +static int linewidth = 0; +static SRECT lastpagesize; static SHAPE* shape; static int shapeid = -1; static int textid = -1; -static int drawmode = -1; static int fillstyleid; static int linestyleid; static int swflastx=0; @@ -87,10 +90,13 @@ int CHARMIDY = 0; char fillstylechanged = 0; +int bboxrectpos = -1; +SRECT bboxrect; + static void startshape(struct swfoutput* obj); static void starttext(struct swfoutput* obj); -static void endshape(); -static void endtext(); +static void endshape(struct swfoutput* obj,int clip); +static void endtext(struct swfoutput* obj); // matrix multiplication. changes p0 static void transform (plotxy*p0,struct swfmatrix*m) @@ -116,23 +122,58 @@ static int moveto(TAG*tag, plotxy p0) } return 0; } +static int moveto(TAG*tag, float x, float y) +{ + plotxy p; + p.x = x; + p.y = y; + return moveto(tag, p); +} +static void addPointToBBox(int px, int py) +{ + SPOINT p; + p.x = px; + p.y = py; + if(fill) { + swf_ExpandRect(&bboxrect, p); + } else { + swf_ExpandRect3(&bboxrect, p, linewidth*3/2); + } +} // write a line-to command into the swf static void lineto(TAG*tag, plotxy p0) { - int rx = ((int)(p0.x*20)-swflastx); - int ry = ((int)(p0.y*20)-swflasty); + int px = (int)(p0.x*20); + int py = (int)(p0.y*20); + int rx = (px-swflastx); + int ry = (py-swflasty); /* we can't skip this for rx=0,ry=0, those are plots */ swf_ShapeSetLine (tag, shape, rx,ry); + + addPointToBBox(swflastx,swflasty); + addPointToBBox(px,py); + shapeisempty = 0; swflastx+=rx; swflasty+=ry; } +static void lineto(TAG*tag, double x, double y) +{ + plotxy p; + p.x = x; + p.y = y; + lineto(tag, p); +} + // write a spline-to command into the swf static void splineto(TAG*tag, plotxy control,plotxy end) { + int lastlastx = swflastx; + int lastlasty = swflasty; + int cx = ((int)(control.x*20)-swflastx); int cy = ((int)(control.y*20)-swflasty); swflastx += cx; @@ -141,8 +182,13 @@ static void splineto(TAG*tag, plotxy control,plotxy end) int ey = ((int)(end.y*20)-swflasty); swflastx += ex; swflasty += ey; - if(cx || cy || ex || ey) + + if(cx || cy || ex || ey) { swf_ShapeSetCurve(tag, shape, cx,cy,ex,ey); + addPointToBBox(lastlastx ,lastlasty ); + addPointToBBox(lastlastx+cx,lastlasty+cy); + addPointToBBox(lastlastx+cx+ex,lastlasty+cy+ey); + } shapeisempty = 0; } @@ -198,27 +244,26 @@ static void stopFill() { if(lastwasfill) { - swf_ShapeSetStyle(tag,shape,linestyleid,0x8000,0); - fillstylechanged = 1; - lastwasfill = 0; + swf_ShapeSetStyle(tag,shape,linestyleid,0x8000,0); + fillstylechanged = 1; + lastwasfill = 0; } } static void startFill() { if(!lastwasfill) { - swf_ShapeSetStyle(tag,shape,0x8000,fillstyleid,0); - fillstylechanged = 1; - lastwasfill = 1; + swf_ShapeSetStyle(tag,shape,0x8000,fillstyleid,0); + fillstylechanged = 1; + lastwasfill = 1; } } /* draw an outline. These are generated by pdf2swf and by t1lib (representing characters). */ -void drawpath(TAG*tag, SWF_OUTLINE*outline, struct swfmatrix*m, int log) +void drawpath(struct swfoutput*output, SWF_OUTLINE*outline, struct swfmatrix*m, int log) { - if(tag->id != ST_DEFINEFONT && - tag->id != ST_DEFINESHAPE && + if( tag->id != ST_DEFINESHAPE && tag->id != ST_DEFINESHAPE2 && tag->id != ST_DEFINESHAPE3) { @@ -236,6 +281,18 @@ void drawpath(TAG*tag, SWF_OUTLINE*outline, struct swfmatrix*m, int log) y += (outline->dest.y/(float)0xffff); if(outline->type == SWF_PATHTYPE_MOVE) { + //if(!init && fill && output->drawmode != DRAWMODE_EOFILL && !ignoredraworder) { + if(filloverlap && !init && fill && output->drawmode != DRAWMODE_EOFILL) { + /* drawmode=FILL (not EOFILL) means that + seperate shapes do not cancel each other out. + On SWF side, we need to start a new shape for each + closed polygon, because SWF only knows EOFILL. + */ + endshape(output,0); + startshape(output); + startFill(); + } + if(((int)(lastx*20) != (int)(firstx*20) || (int)(lasty*20) != (int)(firsty*20)) && fill && !init) @@ -456,7 +513,7 @@ void drawShortPathWithEnds(struct swfoutput*output, double x, double y, struct s int back = 0; if(line_cap == LINE_CAP_BUTT || line_cap == LINE_CAP_SQUARE) { - endshape(); + endshape(output,0); startshape(output); SWF_OUTLINE *last, *tmp=outline; plotxy s,e,p0,p1,p2,p3,m0,m1,m2,m3; @@ -502,6 +559,7 @@ void drawShortPathWithEnds(struct swfoutput*output, double x, double y, struct s for(nr=0;nr<2;nr++) { int dir=0; struct plotxy q0,q1,q2,q3,q4,q5; + startFill(); if(line_cap == LINE_CAP_BUTT) { if(dir) { @@ -534,11 +592,7 @@ void drawShortPathWithEnds(struct swfoutput*output, double x, double y, struct s if(line_cap == LINE_CAP_BUTT) { lineto(tag, q0); - swf_ShapeSetEnd(tag); - tag = swf_InsertTag(tag, ST_PLACEOBJECT2); - swf_ObjectPlaceClip(tag,shapeid,depth,NULL,NULL,NULL,depth+2-nr); - depth++; - shapeid = -1; + endshape(output, depth+2-nr); startshape(output); } p0 = m0; @@ -553,7 +607,7 @@ void drawShortPathWithEnds(struct swfoutput*output, double x, double y, struct s drawShortPath(output,x,y,m,outline); if(line_cap == LINE_CAP_BUTT) { - endshape(); + endshape(output,0); startshape(output); } } @@ -615,7 +669,7 @@ void drawShortPathWithStraightEnds(struct swfoutput*output, double x, double y, need to draw) are very likely to overlap. To avoid that they cancel each other out at the end points, start a new shape for the second one */ - endshape();startshape(output); + endshape(output,0);startshape(output); startFill(); } @@ -657,8 +711,7 @@ static float t1linelen(SWF_OUTLINE*line) void drawpath2poly(struct swfoutput *output, SWF_OUTLINE*outline, struct swfmatrix*m, int log, int line_join, int line_cap, double line_width, double miter_limit) { - if(tag->id != ST_DEFINEFONT && - tag->id != ST_DEFINESHAPE && + if( tag->id != ST_DEFINESHAPE && tag->id != ST_DEFINESHAPE2 && tag->id != ST_DEFINESHAPE3) { msg(" internal error: drawpath needs a shape tag, not %d\n",tag->id); @@ -723,7 +776,7 @@ static inline int colorcompare(RGBA*a,RGBA*b) static const int CHARDATAMAX = 8192; struct chardata { int charid; - int fontid; + int fontid; /* TODO: use a SWFFONT instead */ int x; int y; int size; @@ -731,6 +784,64 @@ struct chardata { } chardata[CHARDATAMAX]; int chardatapos = 0; +static SRECT getcharacterbbox(SWFFONT*font) +{ + SRECT r; + char debug = 0; + memset(&r, 0, sizeof(r)); + + int t; + if(debug) printf("\n"); + for(t=0;tid) { + msg(" Internal error: fontid %d != fontid %d", chardata[t].fontid, font->id); + exit(1); + } + SRECT b = font->layout->bounds[chardata[t].charid]; + b.xmin *= chardata[t].size; + b.ymin *= chardata[t].size; + b.xmax *= chardata[t].size; + b.ymax *= chardata[t].size; + b.xmin /= 1024; + b.ymin /= 1024; + b.xmax /= 1024; + b.ymax /= 1024; + b.xmin += chardata[t].x; + b.ymin += chardata[t].y; + b.xmax += chardata[t].x; + b.ymax += chardata[t].y; + + /* until we solve the INTERNAL_SCALING problem (see below) + make sure the bounding box is big enough */ + b.xmin -= 20; + b.ymin -= 20; + b.xmax += 20; + b.ymax += 20; + + if(debug) printf("(%f,%f,%f,%f) -> (%f,%f,%f,%f) [font %d/%d, char %d]\n", + font->layout->bounds[chardata[t].charid].xmin/20.0, + font->layout->bounds[chardata[t].charid].ymin/20.0, + font->layout->bounds[chardata[t].charid].xmax/20.0, + font->layout->bounds[chardata[t].charid].ymax/20.0, + b.xmin/20.0, + b.ymin/20.0, + b.xmax/20.0, + b.ymax/20.0, + chardata[t].fontid, + font->id, + chardata[t].charid + ); + swf_ExpandRect2(&r, &b); + } + if(debug) printf("-----> (%f,%f,%f,%f)\n", + r.xmin/20.0, + r.ymin/20.0, + r.xmax/20.0, + r.ymax/20.0); + return r; +} + static void putcharacters(TAG*tag) { int t; @@ -873,7 +984,7 @@ static void putcharacter(struct swfoutput*obj, int fontid, int charid, if(chardatapos == CHARDATAMAX) { msg(" Character buffer too small. SWF will be slightly bigger"); - endtext(); + endtext(obj); starttext(obj); } chardata[chardatapos].fontid = fontid; @@ -891,50 +1002,49 @@ struct fontlist_t fontlist_t*next; } *fontlist = 0; +/* Notice: we can only put chars in the range -1639,1638 (-32768/20,32768/20). + So if we set this value to high, the char coordinates will overflow. + If we set it to low, however, the char positions will be inaccurate */ +#define FONT_INTERNAL_SIZE 4 + /* process a character. */ static int drawchar(struct swfoutput*obj, SWFFONT *swffont, char*character, int charnr, int u, swfmatrix*m) { - int usefonts=1; - if(m->m12!=0 || m->m21!=0) - usefonts=0; - if(m->m11 != m->m22) - usefonts=0; - if(!swffont) { msg(" Font is NULL"); return 0; } - if(!usefonts) { - msg(" Non diagonal font matrix: %f %f", m->m11, m->m21); - msg(" | %f %f", m->m12, m->m22); + int charid = getCharID(swffont, charnr, character, u); + + if(charid<0) { + msg(" Didn't find character '%s' (c=%d,u=%d) in current charset (%s, %d characters)", + FIXNULL(character),charnr, u, FIXNULL((char*)swffont->name), swffont->numchars); + return 0; } - //if(usefonts && ! drawonlyshapes) - if (1) - { - int charid = getCharID(swffont, charnr, character, u); - - if(charid<0) { - msg(" Didn't find character '%s' (c=%d,u=%d) in current charset (%s, %d characters)", - FIXNULL(character),charnr, u, FIXNULL((char*)swffont->name), swffont->numchars); - /*fontlist_t*it = fontlist; - while(it) { - msg(" Font history: %s [%d]", it->swffont->name, getCharID(it->swffont, charnr, character, u)); - it = it->next; - }*/ - return 0; - } - - if(shapeid>=0) - endshape(); - if(textid<0) - starttext(obj); + if(shapeid>=0) + endshape(obj,0); + if(textid<0) + starttext(obj); - putcharacter(obj, swffont->id, charid,(int)(m->m13*20),(int)(m->m23*20), - (int)(m->m11+0.5)); + float x = m->m13; + float y = m->m23; + float det = ((m->m11*m->m22)-(m->m21*m->m12)); + if(fabs(det) < 0.0005) { + /* x direction equals y direction- the text is invisible */ return 1; } + det = 20*FONT_INTERNAL_SIZE / det; + + SPOINT p; + p.x = (SCOORD)(( x * m->m22 - y * m->m12)*det); + p.y = (SCOORD)((- x * m->m21 + y * m->m11)*det); + + putcharacter(obj, swffont->id, charid,p.x,p.y,FONT_INTERNAL_SIZE); + swf_FontUseGlyph(swffont, charid); + return 1; + /*else { SWF_OUTLINE*outline = font->getOutline(character, charnr); @@ -953,7 +1063,7 @@ static int drawchar(struct swfoutput*obj, SWFFONT *swffont, char*character, int m2.m22/=100; if(textid>=0) - endtext(); + endtext(obj); if(shapeid<0) startshape(obj); @@ -966,18 +1076,43 @@ static int drawchar(struct swfoutput*obj, SWFFONT *swffont, char*character, int }*/ } +static void endtext(swfoutput*obj) +{ + if(textid<0) + return; + + tag = swf_InsertTag(tag,ST_DEFINETEXT); + swf_SetU16(tag, textid); + + SRECT r; + r = getcharacterbbox(obj->swffont); + + swf_SetRect(tag,&r); + + MATRIX m; + swf_GetMatrix(0, &m); + swf_SetMatrix(tag,&m); + + putcharacters(tag); + swf_SetU8(tag,0); + tag = swf_InsertTag(tag,ST_PLACEOBJECT2); + swf_ObjectPlace(tag,textid,/*depth*/depth++,&obj->fontmatrix,NULL,NULL); + textid = -1; +} + + /* draw a curved polygon. */ void swfoutput_drawpath(swfoutput*output, SWF_OUTLINE*outline, struct swfmatrix*m) { if(textid>=0) - endtext(); + endtext(output); /* Multiple polygons in one shape don't overlap correctly, so we better start a new shape here if the polygon is filled */ if(shapeid>=0 && fill && !ignoredraworder) { - endshape(); + endshape(output,0); } if(shapeid<0) @@ -988,15 +1123,15 @@ void swfoutput_drawpath(swfoutput*output, SWF_OUTLINE*outline, else startFill(); - drawpath(tag, outline,m, 0); + drawpath(output, outline,m, 0); } void swfoutput_drawpath2poly(struct swfoutput*output, SWF_OUTLINE*outline, struct swfmatrix*m, int line_join, int line_cap, double line_width, double miter_limit) { if(textid>=0) - endtext(); + endtext(output); if(shapeid>=0) - endshape(); + endshape(output,0); assert(shapeid<0); startshape(output); stopFill(); @@ -1007,9 +1142,10 @@ void swfoutput_drawpath2poly(struct swfoutput*output, SWF_OUTLINE*outline, struc int getCharID(SWFFONT *font, int charnr, char *charname, int u) { int t; - if(charname) { + if(charname && font->glyphnames) { for(t=0;tnumchars;t++) { if(font->glyphnames[t] && !strcmp(font->glyphnames[t],charname)) { + msg(" Char [%d,>%s<,%d] maps to %d\n", charnr, charname, u, t); return t; } } @@ -1017,27 +1153,35 @@ int getCharID(SWFFONT *font, int charnr, char *charname, int u) we can find the capitalized version */ for(t=0;tnumchars;t++) { if(font->glyphnames[t] && !strcasecmp(font->glyphnames[t],charname)) { + msg(" Char [%d,>>%s<<,%d] maps to %d\n", charnr, charname, u, t); return t; } } } if(u>0) { - if(u>=font->maxascii) - msg(" u=%d, font->maxascii=%d",u,font->maxascii); - else - msg(" u=%d, font->maxascii=%d ascci2glyph[%d]=%d",u,font->maxascii,u,font->ascii2glyph[u]); - /* try to use the unicode id */ if(u>=0 && umaxascii && font->ascii2glyph[u]>=0) { + msg(" Char [%d,%s,>%d<] maps to %d\n", charnr, charname, u, font->ascii2glyph[u]); return font->ascii2glyph[u]; } } if(charnr>=0 && charnrnumchars) { + msg(" Char [>%d<,%s,%d] maps to %d\n", charnr, charname, u, charnr); return charnr; } + if(font->encoding != FONT_ENCODING_UNICODE) { + /* the following only works if the font encoding + is US-ASCII based. It's needed for fonts which return broken unicode + indices */ + if(charnr>=0 && charnrmaxascii && font->ascii2glyph[charnr]>=0) { + msg(" Char [>%d<,%s,%d] maps to %d\n", charnr, charname, u, font->ascii2glyph[charnr]); + return font->ascii2glyph[charnr]; + } + } + return -1; } @@ -1054,6 +1198,10 @@ void swfoutput_setfont(struct swfoutput*obj, char*fontid, char*filename) if(obj->swffont && obj->swffont->name && !strcmp((char*)obj->swffont->name,fontid)) return; + /* TODO: remove the need for this (enhance getcharacterbbox so that it can cope + with multiple fonts */ + endtext(obj); + iterator = fontlist; while(iterator) { if(!strcmp((char*)iterator->swffont->name,fontid)) { @@ -1069,6 +1217,7 @@ void swfoutput_setfont(struct swfoutput*obj, char*fontid, char*filename) return; } + swf_SetLoadFontParameters(64,/*skip unused*/0,/*full unicode*/1); SWFFONT*swffont = swf_LoadFont(filename); if(swffont == 0) { @@ -1089,7 +1238,17 @@ void swfoutput_setfont(struct swfoutput*obj, char*fontid, char*filename) msg(" | Style: %d", swffont->style); msg(" | Encoding: %d", swffont->encoding); for(int iii=0; iiinumchars;iii++) { - msg(" | Glyph %d) name=%s, unicode=%d\n", iii, swffont->glyphnames[iii], swffont->glyph2ascii[iii]); + msg(" | Glyph %d) name=%s, unicode=%d size=%d bbox=(%.2f,%.2f,%.2f,%.2f)\n", iii, swffont->glyphnames?swffont->glyphnames[iii]:"", swffont->glyph2ascii[iii], swffont->glyph[iii].shape->bitlen, + swffont->layout->bounds[iii].xmin/20.0, + swffont->layout->bounds[iii].ymin/20.0, + swffont->layout->bounds[iii].xmax/20.0, + swffont->layout->bounds[iii].ymax/20.0 + ); + int t; + for(t=0;tmaxascii;t++) { + if(swffont->ascii2glyph[t] == iii) + msg(" | - maps to %d",t); + } } } @@ -1130,12 +1289,19 @@ void swfoutput_setfontmatrix(struct swfoutput*obj,double m11,double m12, obj->fontm21 == m21 && obj->fontm22 == m22) return; -// if(textid>=0) -// endtext(); + if(textid>=0) + endtext(obj); obj->fontm11 = m11; obj->fontm12 = m12; obj->fontm21 = m21; obj->fontm22 = m22; + + MATRIX m; + m.sx = (U32)(((obj->fontm11)*65536)/FONT_INTERNAL_SIZE); m.r1 = (U32)(((obj->fontm12)*65536)/FONT_INTERNAL_SIZE); + m.r0 = (U32)(((obj->fontm21)*65536)/FONT_INTERNAL_SIZE); m.sy = (U32)(((obj->fontm22)*65536)/FONT_INTERNAL_SIZE); + m.tx = 0; + m.ty = 0; + obj->fontmatrix = m; } /* draws a character at x,y. */ @@ -1151,69 +1317,128 @@ int swfoutput_drawchar(struct swfoutput* obj,double x,double y,char*character, i return drawchar(obj, obj->swffont, character, charnr, u, &m); } +static void endpage(struct swfoutput*obj) +{ + if(shapeid>=0) + endshape(obj,0); + if(textid>=0) + endtext(obj); + while(clippos) + swfoutput_endclip(obj); + + if(insertstoptag) { + ActionTAG*atag=0; + atag = action_Stop(atag); + atag = action_End(atag); + tag = swf_InsertTag(tag,ST_DOACTION); + swf_ActionSet(tag,atag); + } + tag = swf_InsertTag(tag,ST_SHOWFRAME); +} + +static int firstpage = 1; +void swfoutput_newpage(struct swfoutput*obj, int pageNum, int x1, int y1, int x2, int y2) +{ + if(!firstpage) + endpage(obj); + + for(depth--;depth>=startdepth;depth--) { + tag = swf_InsertTag(tag,ST_REMOVEOBJECT2); + swf_SetU16(tag,depth); + } + depth = startdepth = 3; /* leave room for clip and background rectangle */ + + sizex = x2; + sizey = y2; + x1*=20;y1*=20;x2*=20;y2*=20; + + if(lastpagesize.xmin != x1 || + lastpagesize.xmax != x2 || + lastpagesize.ymin != y1 || + lastpagesize.ymax != y2) + {/* add white clipping rectangle */ + msg(" processing page %d (%dx%d)", pageNum,sizex,sizey); + + if(!firstpage) { + msg(" Page has a different size than previous ones"); + tag = swf_InsertTag(tag,ST_REMOVEOBJECT2); + swf_SetU16(tag,1); + tag = swf_InsertTag(tag,ST_REMOVEOBJECT2); + swf_SetU16(tag,2); + } + + RGBA rgb; + rgb.a = rgb.r = rgb.g = rgb.b = 0xff; + SRECT r; + SHAPE* s; + int ls1=0,fs1=0; + int shapeid = ++currentswfid; + r.xmin = x1; + r.ymin = y1; + r.xmax = x2; + r.ymax = y2; + tag = swf_InsertTag(tag, ST_DEFINESHAPE); + swf_ShapeNew(&s); + fs1 = swf_ShapeAddSolidFillStyle(s, &rgb); + swf_SetU16(tag,shapeid); + swf_SetRect(tag,&r); + swf_SetShapeHeader(tag,s); + swf_ShapeSetAll(tag,s,x1,y1,ls1,fs1,0); + swf_ShapeSetLine(tag,s,(x2-x1),0); + swf_ShapeSetLine(tag,s,0,(y2-y1)); + swf_ShapeSetLine(tag,s,(x1-x2),0); + swf_ShapeSetLine(tag,s,0,(y1-y2)); + swf_ShapeSetEnd(tag); + swf_ShapeFree(s); + tag = swf_InsertTag(tag, ST_PLACEOBJECT2); + swf_ObjectPlace(tag,shapeid,/*depth*/1,0,0,0); + tag = swf_InsertTag(tag, ST_PLACEOBJECT2); + swf_ObjectPlaceClip(tag,shapeid,/*depth*/2,0,0,0,65535); + } else { + msg(" processing page %d", pageNum); + } + + lastpagesize.xmin = x1; + lastpagesize.xmax = x2; + lastpagesize.ymin = y1; + lastpagesize.ymax = y2; + swf_ExpandRect2(&swf.movieSize, &lastpagesize); + + firstpage = 0; +} + /* initialize the swf writer */ -void swfoutput_init(struct swfoutput* obj, char*_filename, int x1, int y1, int x2, int y2) +void swfoutput_init(struct swfoutput* obj, char*_filename) { - RGBA rgb; SRECT r; + RGBA rgb; memset(obj, 0, sizeof(struct swfoutput)); filename = _filename; - sizex = x2; - sizey = y2; msg(" initializing swf output for size %d*%d\n", sizex,sizey); obj->swffont = 0; + obj->drawmode = -1; memset(&swf,0x00,sizeof(SWF)); + memset(&lastpagesize,0x00,sizeof(SRECT)); swf.fileVersion = flashversion; swf.frameRate = 0x0040; // 1 frame per 4 seconds - swf.movieSize.xmin = 20*x1; - swf.movieSize.ymin = 20*y1; - swf.movieSize.xmax = 20*x2; - swf.movieSize.ymax = 20*y2; - - depth = 1; + swf.movieSize.xmin = 0; + swf.movieSize.ymin = 0; + swf.movieSize.xmax = 0; + swf.movieSize.ymax = 0; swf.firstTag = swf_InsertTag(NULL,ST_SETBACKGROUNDCOLOR); tag = swf.firstTag; rgb.a = rgb.r = rgb.g = rgb.b = 0xff; swf_SetRGB(tag,&rgb); - if(1)/* add white rectangle */ - { - SRECT r; - SHAPE* s; - int ls1=0,fs1=0; - int shapeid = ++currentswfid; - r.xmin = x1*20; - r.ymin = y1*20; - r.xmax = x2*20; - r.ymax = y2*20; - tag = swf_InsertTag(tag, ST_DEFINESHAPE); - swf_ShapeNew(&s); - fs1 = swf_ShapeAddSolidFillStyle(s, &rgb); - swf_SetU16(tag,shapeid); - swf_SetRect(tag,&r); - swf_SetShapeHeader(tag,s); - swf_ShapeSetAll(tag,s,x1*20,y1*20,ls1,fs1,0); - swf_ShapeSetLine(tag,s,20*(x2-x1),0); - swf_ShapeSetLine(tag,s,0,20*(y2-y1)); - swf_ShapeSetLine(tag,s,20*(x1-x2),0); - swf_ShapeSetLine(tag,s,0,20*(y1-y2)); - swf_ShapeSetEnd(tag); - swf_ShapeFree(s); - tag = swf_InsertTag(tag, ST_PLACEOBJECT2); - swf_ObjectPlace(tag,shapeid,depth++,0,0,0); - tag = swf_InsertTag(tag, ST_PLACEOBJECT2); - swf_ObjectPlaceClip(tag,shapeid,depth++,0,0,0,65535); - } - if(flag_protected) tag = swf_InsertTag(tag, ST_PROTECT); - startdepth = depth; + startdepth = depth = 0; } void swfoutput_setprotected() //write PROTECT tag @@ -1227,12 +1452,12 @@ static void startshape(struct swfoutput*obj) SRECT r; if(textid>=0) - endtext(); + endtext(obj); tag = swf_InsertTag(tag,ST_DEFINESHAPE); swf_ShapeNew(&shape); - linestyleid = swf_ShapeAddLineStyle(shape,obj->linewidth,&obj->strokergb); + linestyleid = swf_ShapeAddLineStyle(shape,linewidth,&obj->strokergb); rgb.r = obj->fillrgb.r; rgb.g = obj->fillrgb.g; rgb.b = obj->fillrgb.b; @@ -1241,17 +1466,20 @@ static void startshape(struct swfoutput*obj) shapeid = ++currentswfid; swf_SetU16(tag,shapeid); // ID + bboxrectpos = tag->len; r.xmin = 0; r.ymin = 0; r.xmax = 20*sizex; r.ymax = 20*sizey; - swf_SetRect(tag,&r); + + memset(&bboxrect, 0, sizeof(bboxrect)); swf_SetShapeStyles(tag,shape); swf_ShapeCountBits(shape,NULL,NULL); swf_SetShapeBits(tag,shape); + /* TODO: do we really need this? */ swf_ShapeSetAll(tag,shape,/*x*/0,/*y*/0,linestyleid,0,0); swflastx=swflasty=0; lastwasfill = 0; @@ -1260,92 +1488,117 @@ static void startshape(struct swfoutput*obj) static void starttext(struct swfoutput*obj) { - SRECT r; - MATRIX m; if(shapeid>=0) - endshape(); - tag = swf_InsertTag(tag,ST_DEFINETEXT); + endshape(obj,0); + textid = ++currentswfid; - swf_SetU16(tag, textid); - r.xmin = 0; - r.ymin = 0; - r.xmax = 20*sizex; - r.ymax = 20*sizey; - - swf_SetRect(tag,&r); - - m.sx = 65536; - m.sy = 65536; - m.r0 = 0; - m.r1 = 0; - m.tx = 0; - m.ty = 0; - - swf_SetMatrix(tag,&m); swflastx=swflasty=0; } + -static void endshape() +/* TODO: move to ../lib/rfxswf */ +void changeRect(TAG*tag, int pos, SRECT*newrect) { - if(shapeid<0) - return; - swf_ShapeSetEnd(tag); - - if(shapeisempty) { - msg(" empty shape"); - // TODO: delete tag - } - - tag = swf_InsertTag(tag,ST_PLACEOBJECT2); - swf_ObjectPlace(tag,shapeid,/*depth*/depth++,NULL,NULL,NULL); - shapeid = -1; + /* determine length of old rect */ + tag->pos = pos; + tag->readBit = 0; + SRECT old; + swf_GetRect(tag, &old); + swf_ResetReadBits(tag); + int pos_end = tag->pos; + + int len = tag->len - pos_end; + U8*data = (U8*)malloc(len); + memcpy(data, &tag->data[pos_end], len); + tag->writeBit = 0; + tag->len = pos; + swf_SetRect(tag, newrect); + swf_SetBlock(tag, data, len); + free(data); + tag->pos = tag->readBit = 0; } -static void endtext() +void cancelshape(swfoutput*obj) { - if(textid<0) - return; - putcharacters(tag); - swf_SetU8(tag,0); - tag = swf_InsertTag(tag,ST_PLACEOBJECT2); - swf_ObjectPlace(tag,textid,/*depth*/depth++,NULL,NULL,NULL); - textid = -1; + /* delete old shape tag */ + TAG*todel = tag; + tag = tag->prev; + swf_DeleteTag(todel); + shapeid = -1; + bboxrectpos = -1; } -static void endpage(struct swfoutput*obj) +void fixAreas(swfoutput*obj) { - if(shapeid>=0) - endshape(); - if(textid>=0) - endtext(); - while(clippos) - swfoutput_endclip(obj); + if(!shapeisempty && fill && + (bboxrect.xmin == bboxrect.xmax || + bboxrect.ymin == bboxrect.ymax) && + minlinewidth >= 0.001 + ) { + msg(" Shape has size 0: width=%.2f height=%.2f", + (bboxrect.xmax-bboxrect.xmin)/20.0, + (bboxrect.ymax-bboxrect.ymin)/20.0 + ); + + SRECT r = bboxrect; + + if(r.xmin == r.xmax && r.ymin == r.ymax) { + /* this thing comes down to a single dot- nothing to fix here */ + return; + } - if(insertstoptag) { - ActionTAG*atag=0; - atag = action_Stop(atag); - atag = action_End(atag); - tag = swf_InsertTag(tag,ST_DOACTION); - swf_ActionSet(tag,atag); + cancelshape(obj); + + RGBA save_col = obj->strokergb; + int save_width = linewidth; + + obj->strokergb = obj->fillrgb; + linewidth = (int)(minlinewidth*20); + if(linewidth==0) linewidth = 1; + + startshape(obj); + + moveto(tag, r.xmin/20.0,r.ymin/20.0); + lineto(tag, r.xmax/20.0,r.ymax/20.0); + + obj->strokergb = save_col; + linewidth = save_width; } - tag = swf_InsertTag(tag,ST_SHOWFRAME); + } -void swfoutput_newpage(struct swfoutput*obj) +static void endshape(swfoutput*obj, int clipdepth) { - endpage(obj); + if(shapeid<0) + return; - for(depth--;depth>=startdepth;depth--) { - tag = swf_InsertTag(tag,ST_REMOVEOBJECT2); - swf_SetU16(tag,depth); + if(!clipdepth) + fixAreas(obj); + + if(shapeisempty || + (bboxrect.xmin == bboxrect.xmax && bboxrect.ymin == bboxrect.ymax)) + { + // delete the shape again, we didn't do anything + cancelshape(obj); + return; } + + swf_ShapeSetEnd(tag); - depth = startdepth; + changeRect(tag, bboxrectpos, &bboxrect); + + tag = swf_InsertTag(tag,ST_PLACEOBJECT2); + if(clipdepth) + swf_ObjectPlaceClip(tag,shapeid,depth++,NULL,NULL,NULL,clipdepth); + else + swf_ObjectPlace(tag,shapeid,/*depth*/depth++,NULL,NULL,NULL); + + shapeid = -1; + bboxrectpos = -1; } -/* "destroy" like in (oo-terminology) "destructor". Perform cleaning - up, complete the swf, and write it out. */ +/* Perform cleaning up, complete the swf, and write it out. */ void swfoutput_destroy(struct swfoutput* obj) { endpage(obj); @@ -1354,6 +1607,8 @@ void swfoutput_destroy(struct swfoutput* obj) TAG*mtag = swf.firstTag; if(iterator->swffont) { mtag = swf_InsertTag(mtag, ST_DEFINEFONT2); + /*if(!storeallcharacters) + swf_FontReduce(iterator->swffont);*/ swf_FontSetDefine2(mtag, iterator->swffont); swf_FontFree(iterator->swffont); } @@ -1377,7 +1632,7 @@ void swfoutput_destroy(struct swfoutput* obj) tag = swf_InsertTag(tag,ST_END); - if(enablezlib) { + if(enablezlib || flashversion>=6) { if FAILED(swf_WriteSWC(fi,&swf)) msg(" WriteSWC() failed.\n"); } else { @@ -1392,7 +1647,7 @@ void swfoutput_destroy(struct swfoutput* obj) void swfoutput_setdrawmode(swfoutput* obj, int mode) { - drawmode = mode; + obj->drawmode = mode; if(mode == DRAWMODE_FILL) fill = 1; else if(mode == DRAWMODE_EOFILL) @@ -1412,7 +1667,7 @@ void swfoutput_setfillcolor(swfoutput* obj, u8 r, u8 g, u8 b, u8 a) obj->fillrgb.b == b && obj->fillrgb.a == a) return; if(shapeid>=0) - endshape(); + endshape(obj,0); obj->fillrgb.r = r; obj->fillrgb.g = g; @@ -1428,30 +1683,30 @@ void swfoutput_setstrokecolor(swfoutput* obj, u8 r, u8 g, u8 b, u8 a) obj->strokergb.a == a) return; if(shapeid>=0) - endshape(); + endshape(obj,0); obj->strokergb.r = r; obj->strokergb.g = g; obj->strokergb.b = b; obj->strokergb.a = a; } -void swfoutput_setlinewidth(struct swfoutput*obj, double linewidth) +void swfoutput_setlinewidth(struct swfoutput*obj, double _linewidth) { - if(obj->linewidth == (u16)(linewidth*20)) + if(linewidth == (u16)(_linewidth*20)) return; if(shapeid>=0) - endshape(); - obj->linewidth = (u16)(linewidth*20); + endshape(obj,0); + linewidth = (u16)(_linewidth*20); } void swfoutput_startclip(swfoutput*obj, SWF_OUTLINE*outline, struct swfmatrix*m) { if(textid>=0) - endtext(); + endtext(obj); if(shapeid>=0) - endshape(); + endshape(obj,0); if(clippos >= 127) { @@ -1460,7 +1715,7 @@ void swfoutput_startclip(swfoutput*obj, SWF_OUTLINE*outline, struct swfmatrix*m) } startshape(obj); - int olddrawmode = drawmode; + int olddrawmode = obj->drawmode; swfoutput_setdrawmode(obj, DRAWMODE_CLIP); swfoutput_drawpath(obj, outline, m); swf_ShapeSetEnd(tag); @@ -1477,9 +1732,9 @@ void swfoutput_startclip(swfoutput*obj, SWF_OUTLINE*outline, struct swfmatrix*m) void swfoutput_endclip(swfoutput*obj) { if(textid>=0) - endtext(); + endtext(obj); if(shapeid>=0) - endshape(); + endshape(obj,0); if(!clippos) { msg(" Invalid end of clipping region"); @@ -1505,9 +1760,9 @@ void swfoutput_linktourl(struct swfoutput*obj, char*url, swfcoord*points) } if(shapeid>=0) - endshape(); + endshape(obj,0); if(textid>=0) - endtext(); + endtext(obj); if(opennewwindow) actions = action_GetUrl(0, url, "_parent"); @@ -1522,9 +1777,9 @@ void swfoutput_linktopage(struct swfoutput*obj, int page, swfcoord*points) ActionTAG* actions; if(shapeid>=0) - endshape(); + endshape(obj,0); if(textid>=0) - endtext(); + endtext(obj); actions = action_GotoFrame(0, page); actions = action_End(actions); @@ -1542,9 +1797,9 @@ void swfoutput_namedlink(struct swfoutput*obj, char*name, swfcoord*points) char mouseover = 1; if(shapeid>=0) - endshape(); + endshape(obj,0); if(textid>=0) - endtext(); + endtext(obj); if(!strncmp(tmp, "call:", 5)) { @@ -1769,7 +2024,7 @@ static void drawimage(struct swfoutput*obj, int bitid, int sizex,int sizey, myshapeid = ++currentswfid; tag = swf_InsertTag(tag,ST_DEFINESHAPE); swf_ShapeNew(&shape); - //lsid = ShapeAddLineStyle(shape,obj->linewidth,&obj->strokergb); + //lsid = ShapeAddLineStyle(shape,linewidth,&obj->strokergb); //fsid = ShapeAddSolidFillStyle(shape,&obj->fillrgb); fsid = swf_ShapeAddBitmapFillStyle(shape,&m,bitid,1); swf_SetU16(tag, myshapeid); @@ -1809,9 +2064,9 @@ int swfoutput_drawimagejpeg_old(struct swfoutput*obj, char*filename, int sizex,i { TAG*oldtag; if(shapeid>=0) - endshape(); + endshape(obj,0); if(textid>=0) - endtext(); + endtext(obj); int bitid = ++currentswfid; oldtag = tag; @@ -1837,9 +2092,9 @@ int swfoutput_drawimagejpeg(struct swfoutput*obj, RGBA*mem, int sizex,int sizey, JPEGBITS*jpeg; if(shapeid>=0) - endshape(); + endshape(obj,0); if(textid>=0) - endtext(); + endtext(obj); int bitid = ++currentswfid; oldtag = tag; @@ -1858,9 +2113,9 @@ int swfoutput_drawimagelossless(struct swfoutput*obj, RGBA*mem, int sizex,int si { TAG*oldtag; if(shapeid>=0) - endshape(); + endshape(obj,0); if(textid>=0) - endtext(); + endtext(obj); int bitid = ++currentswfid; oldtag = tag; @@ -1885,9 +2140,9 @@ int swfoutput_drawimagelosslessN(struct swfoutput*obj, U8*mem, RGBA*pal, int siz TAG*oldtag; U8*mem2 = 0; if(shapeid>=0) - endshape(); + endshape(obj,0); if(textid>=0) - endtext(); + endtext(obj); if(sizex&3) { @@ -1929,10 +2184,52 @@ void swfoutput_drawimageagain(struct swfoutput*obj, int id, int sizex,int sizey, { if(id<0) return; if(shapeid>=0) - endshape(); + endshape(obj,0); if(textid>=0) - endtext(); + endtext(obj); drawimage(obj, id, sizex, sizey, x1,y1,x2,y2,x3,y3,x4,y4); } +void swfoutput_setparameter(char*name, char*value) +{ + if(!strcmp(name, "drawonlyshapes")) { + drawonlyshapes = atoi(value); + } else if(!strcmp(name, "ignoredraworder")) { + ignoredraworder = atoi(value); + } else if(!strcmp(name, "filloverlap")) { + filloverlap = atoi(value); + } else if(!strcmp(name, "linksopennewwindow")) { + opennewwindow = atoi(value); + } else if(!strcmp(name, "opennewwindow")) { + opennewwindow = atoi(value); + } else if(!strcmp(name, "storeallcharacters")) { + storeallcharacters = atoi(value); + } else if(!strcmp(name, "enablezlib")) { + enablezlib = atoi(value); + } else if(!strcmp(name, "insertstop")) { + insertstoptag = atoi(value); + } else if(!strcmp(name, "flashversion")) { + flashversion = atoi(value); + } else if(!strcmp(name, "minlinewidth")) { + minlinewidth = atof(value); + } else if(!strcmp(name, "jpegquality")) { + int val = atoi(value); + if(val<0) val=0; + if(val>100) val=100; + jpegquality = val; + } else if(!strcmp(name, "splinequality")) { + int v = atoi(value); + v = 500-(v*5); // 100% = 0.25 pixel, 0% = 25 pixel + if(v<1) v = 1; + splinemaxerror = v; + } else if(!strcmp(name, "fontquality")) { + int v = atoi(value); + v = 500-(v*5); // 100% = 0.25 pixel, 0% = 25 pixel + if(v<1) v = 1; + fontsplinemaxerror = v; + } else { + fprintf(stderr, "unknown parameter: %s (=%s)\n", name, value); + } +} +