X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=pdf2swf%2Fswfoutput.cc;h=5d1c10f7a94dfa9535e0017e9be2bb56dd180471;hb=5eb026e91bef063b683796fbbc03158d5711a4e4;hp=f0d43e764fdb7fd7e7c6e4e96c8ce60dfba1915f;hpb=813c13d3a6050b4f081356b3f4b7edc3282c1162;p=swftools.git diff --git a/pdf2swf/swfoutput.cc b/pdf2swf/swfoutput.cc index f0d43e7..5d1c10f 100644 --- a/pdf2swf/swfoutput.cc +++ b/pdf2swf/swfoutput.cc @@ -29,17 +29,13 @@ #else #define assert(a) #endif -#define logf logarithmf // logf is also used by ../lib/log.h #include -#undef logf #include "swfoutput.h" #include "spline.h" extern "C" { #include "../lib/log.h" #include "../lib/rfxswf.h" } -#define standardEncodingSize 335 -extern char *standardEncodingNames[standardEncodingSize]; int opennewwindow=0; int ignoredraworder=0; @@ -48,9 +44,13 @@ 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; typedef unsigned char u8; @@ -64,18 +64,19 @@ 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 char storefont = 0; static int fillstyleid; static int linestyleid; static int swflastx=0; static int swflasty=0; static int lastwasfill = 0; +static int shapeisempty = 1; static char fill = 0; static int sizex; static int sizey; @@ -89,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) @@ -118,22 +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; @@ -142,8 +182,14 @@ 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; } /* write a line, given two points and the transformation @@ -198,31 +244,30 @@ 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 a T1 outline. These are generated by pdf2swf and by t1lib +/* draw an outline. These are generated by pdf2swf and by t1lib (representing characters). */ -void drawpath(TAG*tag, T1_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) { - logf(" internal error: drawpath needs a shape tag, not %d\n",tag->id); + msg(" internal error: drawpath needs a shape tag, not %d\n",tag->id); exit(1); } double x=0,y=0; @@ -234,8 +279,20 @@ void drawpath(TAG*tag, T1_OUTLINE*outline, struct swfmatrix*m, int log) { x += (outline->dest.x/(float)0xffff); y += (outline->dest.y/(float)0xffff); - if(outline->type == T1_PATHTYPE_MOVE) + 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) @@ -253,7 +310,7 @@ void drawpath(TAG*tag, T1_OUTLINE*outline, struct swfmatrix*m, int log) firsty=y; init = 0; } - else if(outline->type == T1_PATHTYPE_LINE) + else if(outline->type == SWF_PATHTYPE_LINE) { plotxy p0; plotxy p1; @@ -264,13 +321,13 @@ void drawpath(TAG*tag, T1_OUTLINE*outline, struct swfmatrix*m, int log) if(log) printf("line: %f,%f -> %f,%f\n",p0.x,p0.y,p1.x,p1.y); line(tag, p0,p1,m); } - else if(outline->type == T1_PATHTYPE_BEZIER) + else if(outline->type == SWF_PATHTYPE_BEZIER) { plotxy p0; plotxy p1; plotxy p2; plotxy p3; - T1_BEZIERSEGMENT*o2 = (T1_BEZIERSEGMENT*)outline; + SWF_BEZIERSEGMENT*o2 = (SWF_BEZIERSEGMENT*)outline; p0.x=x; p0.y=y; p1.x=o2->C.x/(float)0xffff+lastx; @@ -283,7 +340,7 @@ void drawpath(TAG*tag, T1_OUTLINE*outline, struct swfmatrix*m, int log) spline(tag,p0,p1,p2,p3,m); } else { - logf(" drawpath: unknown outline type:%d\n", outline->type); + msg(" drawpath: unknown outline type:%d\n", outline->type); } lastx=x; lasty=y; @@ -304,32 +361,32 @@ void drawpath(TAG*tag, T1_OUTLINE*outline, struct swfmatrix*m, int log) } } -plotxy getPivot(T1_OUTLINE*outline, int dir, double line_width, int end, int trytwo) +plotxy getPivot(SWF_OUTLINE*outline, int dir, double line_width, int end, int trytwo) { - T1_PATHPOINT next, next2; + SWF_PATHPOINT next, next2; double xv=0,yv=0, xv2=0, yv2=0; plotxy p; int two = 0; if(!end) { - if(outline->type == T1_PATHTYPE_LINE) { + if(outline->type == SWF_PATHTYPE_LINE) { next = outline->dest; } else { - next = ((T1_BEZIERSEGMENT*)outline)->B; + next = ((SWF_BEZIERSEGMENT*)outline)->B; if(next.x==0 && next.y==0) { - next = ((T1_BEZIERSEGMENT*)outline)->C; + next = ((SWF_BEZIERSEGMENT*)outline)->C; } if(next.x==0 && next.y==0) { - next = ((T1_BEZIERSEGMENT*)outline)->dest; + next = ((SWF_BEZIERSEGMENT*)outline)->dest; } } next2 = next; - if(trytwo && outline->last && outline->last->type != T1_PATHTYPE_MOVE) { - if(outline->type == T1_PATHTYPE_LINE) { + if(trytwo && outline->last && outline->last->type != SWF_PATHTYPE_MOVE) { + if(outline->type == SWF_PATHTYPE_LINE) { next2 = outline->last->dest; } else { - T1_PATHPOINT c = ((T1_BEZIERSEGMENT*)(outline->last))->C; - T1_PATHPOINT b = ((T1_BEZIERSEGMENT*)(outline->last))->B; + SWF_PATHPOINT c = ((SWF_BEZIERSEGMENT*)(outline->last))->C; + SWF_PATHPOINT b = ((SWF_BEZIERSEGMENT*)(outline->last))->B; next2.x = outline->last->dest.x - c.x; next2.y = outline->last->dest.y - c.y; if(next2.x==0 && next2.y==0) { @@ -344,11 +401,11 @@ plotxy getPivot(T1_OUTLINE*outline, int dir, double line_width, int end, int try two = 1; } } else { - if(outline->type == T1_PATHTYPE_LINE) { + if(outline->type == SWF_PATHTYPE_LINE) { next = outline->dest; } else { - T1_PATHPOINT c = ((T1_BEZIERSEGMENT*)outline)->C; - T1_PATHPOINT b = ((T1_BEZIERSEGMENT*)outline)->B; + SWF_PATHPOINT c = ((SWF_BEZIERSEGMENT*)outline)->C; + SWF_PATHPOINT b = ((SWF_BEZIERSEGMENT*)outline)->B; next.x = outline->dest.x - c.x; next.y = outline->dest.y - c.y; if(next.x==0 && next.y==0) { @@ -361,16 +418,16 @@ plotxy getPivot(T1_OUTLINE*outline, int dir, double line_width, int end, int try } } next2 = next; - if(trytwo && outline->link && outline->link->type != T1_PATHTYPE_MOVE) { - if(outline->type == T1_PATHTYPE_LINE) { + if(trytwo && outline->link && outline->link->type != SWF_PATHTYPE_MOVE) { + if(outline->type == SWF_PATHTYPE_LINE) { next2 = outline->link->dest; } else { - next2 = ((T1_BEZIERSEGMENT*)(outline->link))->B; + next2 = ((SWF_BEZIERSEGMENT*)(outline->link))->B; if(next2.x==0 && next2.y==0) { - next2 = ((T1_BEZIERSEGMENT*)outline->link)->C; + next2 = ((SWF_BEZIERSEGMENT*)outline->link)->C; } if(next2.x==0 && next2.y==0) { - next2 = ((T1_BEZIERSEGMENT*)outline->link)->dest; + next2 = ((SWF_BEZIERSEGMENT*)outline->link)->dest; } } two = 1; @@ -413,15 +470,15 @@ plotxy getPivot(T1_OUTLINE*outline, int dir, double line_width, int end, int try return p; } -void drawShortPath(struct swfoutput*output, double x, double y, struct swfmatrix* m, T1_OUTLINE*outline) +void drawShortPath(struct swfoutput*output, double x, double y, struct swfmatrix* m, SWF_OUTLINE*outline) { double lastx=x, lasty=y; - while (outline && outline->type != T1_PATHTYPE_MOVE) + while (outline && outline->type != SWF_PATHTYPE_MOVE) { x += (outline->dest.x/(float)0xffff); y += (outline->dest.y/(float)0xffff); - if(outline->type == T1_PATHTYPE_LINE) + if(outline->type == SWF_PATHTYPE_LINE) { plotxy p0, p1; p0.x=lastx; @@ -430,10 +487,10 @@ void drawShortPath(struct swfoutput*output, double x, double y, struct swfmatrix p1.y= y; line(tag, p0, p1, m); } - else if(outline->type == T1_PATHTYPE_BEZIER) + else if(outline->type == SWF_PATHTYPE_BEZIER) { plotxy p0,p1,p2,p3; - T1_BEZIERSEGMENT*o2 = (T1_BEZIERSEGMENT*)outline; + SWF_BEZIERSEGMENT*o2 = (SWF_BEZIERSEGMENT*)outline; p3.x=lastx; p3.y=lasty; p1.x=o2->C.x/(float)0xffff+lastx; @@ -450,22 +507,22 @@ void drawShortPath(struct swfoutput*output, double x, double y, struct swfmatrix } } -void drawShortPathWithEnds(struct swfoutput*output, double x, double y, struct swfmatrix* m, T1_OUTLINE*outline, int num, int line_cap, int line_join, double line_width) +void drawShortPathWithEnds(struct swfoutput*output, double x, double y, struct swfmatrix* m, SWF_OUTLINE*outline, int num, int line_cap, int line_join, double line_width) { plotxy d,d2; int back = 0; if(line_cap == LINE_CAP_BUTT || line_cap == LINE_CAP_SQUARE) { - endshape(); + endshape(output,0); startshape(output); - T1_OUTLINE *last, *tmp=outline; + SWF_OUTLINE *last, *tmp=outline; plotxy s,e,p0,p1,p2,p3,m0,m1,m2,m3; double x2 = x; double y2 = y; double lx=x,ly=y; double ee = 1.0; int nr; - while(tmp && tmp->type != T1_PATHTYPE_MOVE) { + while(tmp && tmp->type != SWF_PATHTYPE_MOVE) { last = tmp; lx += (tmp->dest.x/(float)0xffff); ly += (tmp->dest.y/(float)0xffff); @@ -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,12 +607,12 @@ 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); } } -void drawT1toRect(struct swfoutput*output, double x, double y, struct swfmatrix* m, T1_OUTLINE*outline, int num, int line_cap, int line_join, double line_width) +void drawT1toRect(struct swfoutput*output, double x, double y, struct swfmatrix* m, SWF_OUTLINE*outline, int num, int line_cap, int line_join, double line_width) { plotxy d1,d2,p1,p2,p3,p4; @@ -589,9 +643,9 @@ void drawT1toRect(struct swfoutput*output, double x, double y, struct swfmatrix* line(tag, p4,p1, m); } -void drawShortPathWithStraightEnds(struct swfoutput*output, double x, double y, struct swfmatrix* m, T1_OUTLINE*outline, int num, int line_cap, int line_join, double line_width) +void drawShortPathWithStraightEnds(struct swfoutput*output, double x, double y, struct swfmatrix* m, SWF_OUTLINE*outline, int num, int line_cap, int line_join, double line_width) { - T1_OUTLINE*tmp=outline; + SWF_OUTLINE*tmp=outline; double xx=x,yy=y; int stop=0; assert(shapeid>=0); @@ -599,14 +653,14 @@ void drawShortPathWithStraightEnds(struct swfoutput*output, double x, double y, startFill(); drawT1toRect(output, x, y, m,outline, num, line_cap, line_join, line_width); - while(tmp->link && tmp->link->type!=T1_PATHTYPE_MOVE) { + while(tmp->link && tmp->link->type!=SWF_PATHTYPE_MOVE) { xx += (tmp->dest.x/(float)0xffff); yy += (tmp->dest.y/(float)0xffff); tmp = tmp->link; } - assert(tmp->type == T1_PATHTYPE_LINE); - assert(outline->type == T1_PATHTYPE_LINE); + assert(tmp->type == SWF_PATHTYPE_LINE); + assert(outline->type == SWF_PATHTYPE_LINE); if(tmp!=outline) { @@ -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(); } @@ -625,7 +679,7 @@ void drawShortPathWithStraightEnds(struct swfoutput*output, double x, double y, { stopFill();stop=1; int save= tmp->type; - tmp->type = T1_PATHTYPE_MOVE; + tmp->type = SWF_PATHTYPE_MOVE; x += (outline->dest.x/(float)0xffff); y += (outline->dest.y/(float)0xffff); outline = outline->link; @@ -637,17 +691,17 @@ void drawShortPathWithStraightEnds(struct swfoutput*output, double x, double y, stopFill(); } -static int t1len(T1_OUTLINE*line) +static int t1len(SWF_OUTLINE*line) { int num=0; - while(line && line->type != T1_PATHTYPE_MOVE) { + while(line && line->type != SWF_PATHTYPE_MOVE) { num++; line = line->link; } return num; } -static float t1linelen(T1_OUTLINE*line) +static float t1linelen(SWF_OUTLINE*line) { float x,y; x = (line->dest.x/(float)0xffff); @@ -655,13 +709,12 @@ static float t1linelen(T1_OUTLINE*line) return sqrt(x*x+y*y); } -void drawpath2poly(struct swfoutput *output, T1_OUTLINE*outline, struct swfmatrix*m, int log, int line_join, int line_cap, double line_width, double miter_limit) +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) { - logf(" internal error: drawpath needs a shape tag, not %d\n",tag->id); + msg(" internal error: drawpath needs a shape tag, not %d\n",tag->id); exit(1); } assert(shapeid>=0); @@ -669,7 +722,7 @@ void drawpath2poly(struct swfoutput *output, T1_OUTLINE*outline, struct swfmatri double lastx=0,lasty=0; int valid = 0; int lastwasline = 0; - T1_OUTLINE*tmp = outline, *last = 0; + SWF_OUTLINE*tmp = outline, *last = 0; tmp->last = 0; while(1) { @@ -677,9 +730,9 @@ void drawpath2poly(struct swfoutput *output, T1_OUTLINE*outline, struct swfmatri x += (tmp->dest.x/(float)0xffff); y += (tmp->dest.y/(float)0xffff); } - if(!tmp || tmp->type == T1_PATHTYPE_MOVE) { + if(!tmp || tmp->type == SWF_PATHTYPE_MOVE) { if(valid && last) { - if(last->type == T1_PATHTYPE_LINE && t1linelen(last)>line_width*2 && + if(last->type == SWF_PATHTYPE_LINE && t1linelen(last)>line_width*2 && lastwasline && line_cap != LINE_CAP_ROUND) drawShortPathWithStraightEnds(output, lastx, lasty, m, last, valid, line_cap, line_join, line_width); else @@ -697,7 +750,7 @@ void drawpath2poly(struct swfoutput *output, T1_OUTLINE*outline, struct swfmatri valid++; } - if(tmp && tmp->type == T1_PATHTYPE_LINE && t1linelen(tmp)>line_width*2) + if(tmp && tmp->type == SWF_PATHTYPE_LINE && t1linelen(tmp)>line_width*2) lastwasline = 1; else lastwasline = 0; @@ -720,10 +773,10 @@ static inline int colorcompare(RGBA*a,RGBA*b) return 1; } -static const int CHARDATAMAX = 1024; +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; @@ -753,11 +864,11 @@ static void putcharacters(TAG*tag) if(tag->id != ST_DEFINETEXT && tag->id != ST_DEFINETEXT2) { - logf(" internal error: putcharacters needs an text tag, not %d\n",tag->id); + msg(" internal error: putcharacters needs an text tag, not %d\n",tag->id); exit(1); } if(!chardatapos) { - logf(" putcharacters called with zero characters"); + msg(" putcharacters called with zero characters"); } for(pass = 0; pass < 2; pass++) @@ -819,8 +930,12 @@ static void putcharacters(TAG*tag) if(lastx != chardata[t].x || lasty != chardata[t].y) { - newx=chardata[t].x; - newy=chardata[t].y; + newx = chardata[t].x; + newy = chardata[t].y; + if(newx == 0) + newx = SET_TO_ZERO; + if(newy == 0) + newy = SET_TO_ZERO; } if(!colorcompare(&color, &chardata[t].color)) { @@ -868,7 +983,8 @@ static void putcharacter(struct swfoutput*obj, int fontid, int charid, { if(chardatapos == CHARDATAMAX) { - endtext(); + msg(" Character buffer too small. SWF will be slightly bigger"); + endtext(obj); starttext(obj); } chardata[chardatapos].fontid = fontid; @@ -880,34 +996,63 @@ static void putcharacter(struct swfoutput*obj, int fontid, int charid, chardatapos++; } +struct fontlist_t +{ + SWFFONT *swffont; + 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 void drawchar(struct swfoutput*obj, SWFFont*font, char*character, int charnr, swfmatrix*m) +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 && ! drawonlyshapes) - { - int charid = font->getSWFCharID(character, charnr); - if(shapeid>=0) - endshape(); - if(textid<0) - starttext(obj); - putcharacter(obj, font->swfid, charid,(int)(m->m13*20),(int)(m->m23*20), - (int)(m->m11*20/2+0.5)); //where does the /2 come from? + 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; } - else + + if(shapeid>=0) + endshape(obj,0); + if(textid<0) + starttext(obj); + + 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 { - T1_OUTLINE*outline = font->getOutline(character, charnr); + SWF_OUTLINE*outline = font->getOutline(character, charnr); char* charname = character; if(!outline) { - logf(" Didn't find %s in current charset (%s)", - FIXNULL(character),FIXNULL(font->getName())); + msg(" Didn't find character '%s' (%d) in current charset (%s)", + FIXNULL(character),charnr,FIXNULL(font->getName())); return; } @@ -918,7 +1063,7 @@ static void drawchar(struct swfoutput*obj, SWFFont*font, char*character, int cha m2.m22/=100; if(textid>=0) - endtext(); + endtext(obj); if(shapeid<0) startshape(obj); @@ -928,21 +1073,46 @@ static void drawchar(struct swfoutput*obj, SWFFont*font, char*character, int cha fill = 1; drawpath(tag, outline, &m2, 0); fill = lf; - } + }*/ } +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, T1_OUTLINE*outline, +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) @@ -953,15 +1123,15 @@ void swfoutput_drawpath(swfoutput*output, T1_OUTLINE*outline, else startFill(); - drawpath(tag, outline,m, 0); + drawpath(output, outline,m, 0); } -void swfoutput_drawpath2poly(struct swfoutput*output, T1_OUTLINE*outline, struct swfmatrix*m, int line_join, int line_cap, double line_width, double miter_limit) +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(); @@ -969,315 +1139,140 @@ void swfoutput_drawpath2poly(struct swfoutput*output, T1_OUTLINE*outline, struct drawpath2poly(output, outline, m, 0, line_join, line_cap, line_width, miter_limit); } -/* SWFFont: copy all t1 font outlines to a local - array. */ -SWFFont::SWFFont(char*name, int id, char*filename) -{ - if(!T1_GetFontName(id)) - T1_LoadFont(id); - - this->name = strdup(T1_GetFontFileName(id)); - this->fontid = strdup(name); - this->t1id = id; - - char**a= T1_GetAllCharNames(id); - int t, outlinepos=0; - char*map[256]; - - t=0; - while(a[t]) - t++; - this->charnum = t; - - if(!charnum) - return; - logf(" Font %s(%d): Storing %d outlines.\n", FIXNULL(name), id, charnum); - - this->standardtablesize = 256; - if(this->charnum < this->standardtablesize) - this->standardtablesize = this->charnum; - this->standardtable = (char**)malloc(standardtablesize*sizeof(char*)); - - for(t = 0; t < this->standardtablesize; t++) { - char*name = T1_GetCharName(id,t); - if(!name) - name = ""; - standardtable[t] = strdup(name); - } - - outline = (T1_OUTLINE**)malloc(charnum*sizeof(T1_OUTLINE*)); - charname = (char**)malloc(charnum*sizeof(char*)); - width = (int*)malloc(charnum*sizeof(int)); - memset(width, 0, charnum*sizeof(int)); - memset(charname, 0, charnum*sizeof(char*)); - used = (char*)malloc(charnum*sizeof(char)); - char2swfcharid = (U16*)malloc(charnum*2); - swfcharid2char = (U16*)malloc(charnum*2); - swfcharpos = 0; - - memset(used,0,charnum*sizeof(char)); - - this->swfid = ++currentswfid; - - t=0; - while(*a) - { - map[t] = *a; - a++; - t++; - if(t==256 || !*a) { - int s; - for(s=t;s<256;s++) - map[s] = ".notdef"; - - int ret = T1_ReencodeFont(id, map); - if(ret) { - T1_DeleteFont(id); - T1_LoadFont(id); - int ret = T1_ReencodeFont(id, map); - if(ret) - fprintf(stderr,"Can't reencode font: (%s) ret:%d\n",filename, ret); - } - - // parsecharacters - for(s=0;soutline[outlinepos] = T1_CopyOutline(T1_GetCharOutline(id, s, 100.0, 0)); - this->width[outlinepos] = T1_GetCharWidth(id, s); - this->charname[outlinepos] = strdup(name); - outlinepos++; - } - t=0; - } - } -} - -/* free all tables, write out definefont tags */ -SWFFont::~SWFFont() +int getCharID(SWFFONT *font, int charnr, char *charname, int u) { - int t,usednum=0; - int*ptr; - - if(storeallcharacters) - { - int t; - for(t=0;tcharnum;t++) - { - if(this->charname[t]) - getSWFCharID(this->charname[t], -1); - } - } - - ptr = (int*)malloc(swfcharpos*sizeof(int)); - - for(t=0;t Font %s has %d used characters",FIXNULL(fontid), usednum); - TAG*ftag = swf_InsertTag(swf.firstTag,ST_DEFINEFONT); - swf_SetU16(ftag, this->swfid); - int initpos = swf_GetTagLen(ftag); - swfmatrix m; - m.m11 = m.m22 = 1; - m.m21 = m.m12 = 0; - m.m13 = CHARMIDX; - m.m23 = CHARMIDY; - - for(t=0;tdata[ptr[t]] = - SWAP16(swf_GetTagLen(ftag)-initpos); - - swflastx=0; - swflasty=0; - swf_SetU8(ftag,0x10); //1 fill bits, 0 linestyle bits - SHAPE s; - s.bits.fill = 1; - s.bits.line = 0; - swf_ShapeSetStyle(ftag,&s,0,1,0); - fillstylechanged = 1; - int lastfill = fill; - fill = 1; - storefont = 1; - drawpath(ftag, outline[swfcharid2char[t]],&m, 0); - storefont = 0; - fill = lastfill; - swf_ShapeSetEnd(ftag); - } - ftag = swf_InsertTag(ftag,ST_DEFINEFONTINFO); - swf_SetU16(ftag, this->swfid); - if(this->fontid) { - swf_SetU8(ftag, strlen(this->fontid)); - swf_SetBlock(ftag, (U8*)this->fontid, strlen(this->fontid)); - } else { - swf_SetU8(ftag, 0); + int t; + 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; + } } - swf_SetU8(ftag, 0); //flags - for(t=0;tcharname[this->swfcharid2char[t]]; - for(s=0;s<256;s++) { - if(standardEncodingNames[s] && - !strcmp(name,standardEncodingNames[s])) - break; + /* if we didn't find the character, maybe + 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; } - swf_SetU8(ftag, (U8)s); } } - free(ptr); - free(outline); - for(t=0;t0) { + /* 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]; } - free(standardtable); - free(charname); - free(width); - free(used); - free(swfcharid2char); - free(char2swfcharid); -} - -T1_OUTLINE*SWFFont::getOutline(char*name, int charnr) -{ - int t; - for(t=0;tcharnum;t++) { - if(!strcmp(this->charname[t],name)) { - return outline[t]; - } - } - - /* if we didn't find the character, maybe - we can find the capitalized version */ - for(t=0;tcharnum;t++) { - if(!strcasecmp(this->charname[t],name)) - return outline[t]; - } - - /* if we didn't find it by name, use the names of the first 256 characters - of the font to try a new name based on charnr */ - if(this->standardtable && charnr>=0 && charnr < this->standardtablesize) { - return getOutline(this->standardtable[charnr], -1); - } - - logf(" Didn't find character '%s' in font '%s'", FIXNULL(name), this->name); - return 0; -} - -int SWFFont::getSWFCharID(char*name, int charnr) -{ - int t; - for(t=0;tcharnum;t++) { - if(!strcmp(this->charname[t],name)) { - if(!used[t]) - { - swfcharid2char[swfcharpos] = t; - char2swfcharid[t] = swfcharpos++; - used[t] = 1; - } - return char2swfcharid[t]; - } - } - - /* if we didn't find the character, maybe - we can find the capitalized version */ - for(t=0;tcharnum;t++) { - if(!strcasecmp(this->charname[t],name)) { - if(!used[t]) - { - swfcharid2char[swfcharpos] = t; - char2swfcharid[t] = swfcharpos++; - used[t] = 1; - } - return char2swfcharid[t]; - } } - /* if we didn't find it by name, use the names of the first 256 (or so) characters - of the font to try a new name based on charnr */ - if(this->standardtable && charnr>=0 && charnr < this->standardtablesize) { - return getSWFCharID(this->standardtable[charnr], -1); + if(charnr>=0 && charnrnumchars) { + msg(" Char [>%d<,%s,%d] maps to %d\n", charnr, charname, u, charnr); + return charnr; } - logf(" Didn't find character '%s' in font '%s'", FIXNULL(name), this->name); - return 0; -} -int SWFFont::getWidth(char*name) -{ - int t; - for(t=0;tcharnum;t++) { - if(!strcmp(this->charname[t],name)) { - return this->width[t]; - } + 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 0; -} -char*SWFFont::getName() -{ - return this->name; + return -1; } -struct fontlist_t -{ - SWFFont * font; - fontlist_t*next; -} *fontlist = 0; /* set's the t1 font index of the font to use for swfoutput_drawchar(). */ -void swfoutput_setfont(struct swfoutput*obj, char*fontid, int t1id, char*filename) +void swfoutput_setfont(struct swfoutput*obj, char*fontid, char*filename) { fontlist_t*last=0,*iterator; - if(obj->font && !strcmp(obj->font->fontid,fontid)) + if(!fontid) { + msg(" No fontid"); + return; + } + + 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(iterator->font->fontid,fontid)) - break; + if(!strcmp((char*)iterator->swffont->name,fontid)) { + obj->swffont = iterator->swffont; + return; + } last = iterator; iterator = iterator->next; } - if(iterator) - { - obj->font = iterator->font; - return ; + + if(!filename) { + msg(" No filename given for font- internal error?"); + return; } - if(t1id<0) { - logf(" internal error: t1id:%d, fontid:%s\n", t1id,FIXNULL(fontid)); + swf_SetLoadFontParameters(64,/*skip unused*/0,/*full unicode*/1); + SWFFONT*swffont = swf_LoadFont(filename); + + if(swffont == 0) { + msg(" Couldn't load font %s (%s)", fontid, filename); + swffont = swf_LoadFont(0); } + + swf_FontSetID(swffont, ++currentswfid); - SWFFont*font = new SWFFont(fontid, t1id, filename); + if(screenloglevel >= LOGLEVEL_DEBUG) { + // print font information + msg(" Font %s (%s)",swffont->name, filename); + msg(" | ID: %d", swffont->id); + msg(" | Version: %d", swffont->version); + msg(" | Name: %s", fontid); + msg(" | Numchars: %d", swffont->numchars); + msg(" | Maxascii: %d", swffont->maxascii); + msg(" | Style: %d", swffont->style); + msg(" | Encoding: %d", swffont->encoding); + for(int iii=0; iiinumchars;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); + } + } + } + + /* set the font name to the ID we use here */ + if(swffont->name) free(swffont->name); + swffont->name = (U8*)strdup(fontid); + iterator = new fontlist_t; - iterator->font = font; + iterator->swffont = swffont; iterator->next = 0; if(last) last->next = iterator; else fontlist = iterator; - obj->font = font; + + obj->swffont = swffont; } int swfoutput_queryfont(struct swfoutput*obj, char*fontid) { fontlist_t *iterator = fontlist; while(iterator) { - if(!strcmp(iterator->font->fontid,fontid)) + if(!strcmp((char*)iterator->swffont->name,fontid)) return 1; iterator = iterator->next; } @@ -1294,16 +1289,23 @@ 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. */ -void swfoutput_drawchar(struct swfoutput* obj,double x,double y,char*character, int charnr) +int swfoutput_drawchar(struct swfoutput* obj,double x,double y,char*character, int charnr, int u) { swfmatrix m; m.m11 = obj->fontm11; @@ -1312,41 +1314,131 @@ void swfoutput_drawchar(struct swfoutput* obj,double x,double y,char*character, m.m22 = obj->fontm22; m.m13 = x; m.m23 = y; - drawchar(obj, obj->font, character, charnr, &m); + 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 _sizex, int _sizey) +void swfoutput_init(struct swfoutput* obj, char*_filename) { - GLYPH *glyph; - RGBA rgb; SRECT r; + RGBA rgb; memset(obj, 0, sizeof(struct swfoutput)); filename = _filename; - sizex = _sizex; - sizey = _sizey; - logf(" initializing swf output for size %d*%d\n", sizex,sizey); + msg(" initializing swf output for size %d*%d\n", sizex,sizey); - obj->font = 0; + 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.xmax = 20*sizex; - swf.movieSize.ymax = 20*sizey; + 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.r = 0xff; - rgb.g = 0xff; - rgb.b = 0xff; + rgb.a = rgb.r = rgb.g = rgb.b = 0xff; swf_SetRGB(tag,&rgb); - if(flag_protected) // good practice! /r + + if(flag_protected) tag = swf_InsertTag(tag, ST_PROTECT); - depth = 1; - startdepth = depth; + + startdepth = depth = 0; } void swfoutput_setprotected() //write PROTECT tag @@ -1360,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; @@ -1374,118 +1466,158 @@ 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; + shapeisempty = 1; } 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); - 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); + + 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); - depth = 1; - startdepth = depth; + 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); fontlist_t *tmp,*iterator = fontlist; while(iterator) { - delete iterator->font; - iterator->font = 0; + 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); + } + tmp = iterator; iterator = iterator->next; delete tmp; } - T1_CloseLib(); if(!filename) return; if(filename) @@ -1494,28 +1626,28 @@ void swfoutput_destroy(struct swfoutput* obj) fi = 1; // stdout if(fi<=0) { - logf(" Could not create \"%s\". ", FIXNULL(filename)); + msg(" Could not create \"%s\". ", FIXNULL(filename)); exit(1); } tag = swf_InsertTag(tag,ST_END); - if(enablezlib) { + if(enablezlib || flashversion>=6) { if FAILED(swf_WriteSWC(fi,&swf)) - logf(" WriteSWC() failed.\n"); + msg(" WriteSWC() failed.\n"); } else { if FAILED(swf_WriteSWF(fi,&swf)) - logf(" WriteSWF() failed.\n"); + msg(" WriteSWF() failed.\n"); } if(filename) close(fi); - logf(" SWF written\n"); + msg(" SWF written\n"); } void swfoutput_setdrawmode(swfoutput* obj, int mode) { - drawmode = mode; + obj->drawmode = mode; if(mode == DRAWMODE_FILL) fill = 1; else if(mode == DRAWMODE_EOFILL) @@ -1535,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; @@ -1551,39 +1683,39 @@ 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, T1_OUTLINE*outline, struct swfmatrix*m) +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) { - logf(" Too many clip levels."); + msg(" Too many clip levels."); clippos --; } startshape(obj); - int olddrawmode = drawmode; + int olddrawmode = obj->drawmode; swfoutput_setdrawmode(obj, DRAWMODE_CLIP); swfoutput_drawpath(obj, outline, m); swf_ShapeSetEnd(tag); @@ -1600,12 +1732,12 @@ void swfoutput_startclip(swfoutput*obj, T1_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) { - logf(" Invalid end of clipping region"); + msg(" Invalid end of clipping region"); return; } clippos--; @@ -1628,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"); @@ -1645,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); @@ -1665,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)) { @@ -1892,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); @@ -1932,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; @@ -1960,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; @@ -1981,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; @@ -2008,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) { @@ -2052,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); + } +} +