X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=pdf2swf%2Fswfoutput.cc;h=1b08b82cf4674612c48909d8406673cd96d8f8c0;hb=edaf4fc18535763b54c741a12a257700e4aba1f1;hp=e2a85a55975678f47b402f8a52218aff8bb4d902;hpb=c1ca1cfeedba16d4db2f06bc875003658438244d;p=swftools.git diff --git a/pdf2swf/swfoutput.cc b/pdf2swf/swfoutput.cc index e2a85a5..1b08b82 100644 --- a/pdf2swf/swfoutput.cc +++ b/pdf2swf/swfoutput.cc @@ -35,7 +35,10 @@ extern "C" { #include "../lib/log.h" #include "../lib/rfxswf.h" +#include "../lib/gfxdevice.h" +#include "../lib/gfxtools.h" } +#include "../lib/art/libart.h" #define CHARDATAMAX 8192 #define CHARMIDX 0 @@ -56,6 +59,8 @@ struct fontlist_t fontlist_t*next; }; +double config_ppmsubpixels=0; +double config_jpegsubpixels=0; int config_opennewwindow=0; int config_ignoredraworder=0; int config_drawonlyshapes=0; @@ -69,9 +74,14 @@ int config_fontsplinemaxerror=1; int config_filloverlap=0; int config_protect=0; float config_minlinewidth=0.05; +double config_caplinewidth=1; typedef struct _swfoutput_internal { + swfoutput*obj; // the swfoutput object where this internal struct resides + + SWF swf; + fontlist_t* fontlist; char storefont; @@ -83,7 +93,6 @@ typedef struct _swfoutput_internal int depth; int startdepth; int linewidth; - SRECT lastpagesize; SHAPE* shape; int shapeid; @@ -96,36 +105,68 @@ typedef struct _swfoutput_internal int lastwasfill; int shapeisempty; char fill; - int sizex; - int sizey; + int min_x,max_x; + int min_y,max_y; TAG* cliptags[128]; int clipshapes[128]; U32 clipdepths[128]; int clippos; + + /* image cache */ + int pic_xids[1024]; + int pic_yids[1024]; + int pic_ids[1024]; + int pic_width[1024]; + int pic_height[1024]; + int picpos; + + int frameno; + int lastframeno; char fillstylechanged; + + int jpeg; //next image type int bboxrectpos; SRECT bboxrect; + + TAG*cliptag; chardata_t chardata[CHARDATAMAX]; int chardatapos; int firstpage; + char pagefinished; + + /* during the transition to the gfxdevice interface: + a device which uses this swfoutput as target */ + gfxdevice_t device; + } swfoutput_internal; + +void swf_fillbitmap(gfxdevice_t*driver, gfxline_t*line, gfximage_t*img, gfxmatrix_t*move, gfxcxform_t*cxform); +int swf_setparameter(gfxdevice_t*driver, const char*key, const char*value); +void swf_drawstroke(gfxdevice_t*dev, gfxline_t*line, gfxcoord_t width, gfxcolor_t*color, gfx_capType cap_style, gfx_joinType joint_style, gfxcoord_t miterLimit); +void swf_startclip(gfxdevice_t*dev, gfxline_t*line); +void swf_endclip(gfxdevice_t*dev); +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); +void swf_fill(gfxdevice_t*dev, gfxline_t*line, gfxcolor_t*color); +void swf_fillbitmap(gfxdevice_t*dev, gfxline_t*line, gfximage_t*img, gfxmatrix_t*matrix, gfxcxform_t*cxform); +void swf_fillgradient(gfxdevice_t*dev, gfxgradient_t*gradient, gfxgradienttype_t type, gfxmatrix_t*matrix); static swfoutput_internal* init_internal_struct() { swfoutput_internal*i = (swfoutput_internal*)malloc(sizeof(swfoutput_internal)); memset(i, 0, sizeof(swfoutput_internal)); - i->storefont = 0; i->currentswfid = 0; - i->depth = 1; - i->startdepth = 1; + i->depth = 0; + i->startdepth = 0; i->linewidth = 0; i->shapeid = -1; i->textid = -1; + i->frameno = 0; + i->lastframeno = 0; i->fillstyleid; i->linestyleid; @@ -141,13 +182,37 @@ static swfoutput_internal* init_internal_struct() i->bboxrectpos = -1; i->chardatapos = 0; i->firstpage = 1; + i->pagefinished = 1; + + i->device.internal = (void*)i; + i->device.fillbitmap = swf_fillbitmap; + i->device.setparameter = swf_setparameter; + i->device.stroke = swf_stroke; + i->device.startclip = swf_startclip; + i->device.endclip = swf_endclip; + i->device.fill = swf_fill; + i->device.fillbitmap = swf_fillbitmap; + i->device.fillgradient = swf_fillgradient; return i; }; +static int id_error = 0; + +static U16 getNewID(struct swfoutput* obj) +{ + swfoutput_internal*i = (swfoutput_internal*)obj->internal; + if(i->currentswfid == 65535) { + if(!id_error) + msg(" ID Table overflow"); + id_error=1; + } + return ++i->currentswfid; +} + static void startshape(struct swfoutput* obj); static void starttext(struct swfoutput* obj); -static void endshape(struct swfoutput* obj,int clip); +static void endshape(struct swfoutput* obj); static void endtext(struct swfoutput* obj); // matrix multiplication. changes p0 @@ -175,7 +240,7 @@ static int moveto(struct swfoutput*obj, TAG*tag, plotxy p0) } return 0; } -static int moveto(struct swfoutput*obj, TAG*tag, float x, float y) +static int moveto(struct swfoutput*obj, TAG*tag, double x, double y) { swfoutput_internal*i = (swfoutput_internal*)obj->internal; plotxy p; @@ -197,6 +262,32 @@ static void addPointToBBox(struct swfoutput*obj, int px, int py) } } +/*static void plot(struct swfoutput*obj, int x, int y, TAG*tag) +{ + swfoutput_internal*i = (swfoutput_internal*)obj->internal; + int width = i->linewidth/4; + if(width > 5) + width = 5; + ////square + //swf_ShapeSetLine(tag, i->shape,-width,-width); + //swf_ShapeSetLine(tag, i->shape,width*2,0); + //swf_ShapeSetLine(tag, i->shape,0,width*2); + //swf_ShapeSetLine(tag, i->shape,-width*2,0); + //swf_ShapeSetLine(tag, i->shape,0,-width*2); + //swf_ShapeSetLine(tag, i->shape,width,width); + + // diamond + swf_ShapeSetLine(tag, i->shape,-width,0); + swf_ShapeSetLine(tag, i->shape,width,-width); + swf_ShapeSetLine(tag, i->shape,width,width); + swf_ShapeSetLine(tag, i->shape,-width,width); + swf_ShapeSetLine(tag, i->shape,-width,-width); + swf_ShapeSetLine(tag, i->shape,width,0); + + addPointToBBox(obj, x-width ,y-width); + addPointToBBox(obj, x+width ,y+width); +}*/ + // write a line-to command into the swf static void lineto(struct swfoutput*obj, TAG*tag, plotxy p0) { @@ -205,12 +296,15 @@ static void lineto(struct swfoutput*obj, TAG*tag, plotxy p0) int py = (int)(p0.y*20); int rx = (px-i->swflastx); int ry = (py-i->swflasty); - /* we can't skip this for rx=0,ry=0, those - are plots */ - swf_ShapeSetLine (tag, i->shape, rx,ry); - - addPointToBBox(obj, i->swflastx,i->swflasty); - addPointToBBox(obj, px,py); + if(rx|ry) { + swf_ShapeSetLine (tag, i->shape, rx,ry); + addPointToBBox(obj, i->swflastx,i->swflasty); + addPointToBBox(obj, px,py); + }/* else if(!i->fill) { + // treat lines of length 0 as plots, making them + // at least 1 twip wide so Flash will display them + plot(obj, i->swflastx, i->swflasty, tag); + }*/ i->shapeisempty = 0; i->swflastx+=rx; @@ -245,52 +339,20 @@ static void splineto(struct swfoutput*obj, TAG*tag, plotxy control,plotxy end) addPointToBBox(obj, lastlastx ,lastlasty ); addPointToBBox(obj, lastlastx+cx,lastlasty+cy); addPointToBBox(obj, lastlastx+cx+ex,lastlasty+cy+ey); - } + }/* else if(!i->fill) { + // treat splines of length 0 as plots + plot(obj, lastlastx, lastlasty, tag); + }*/ i->shapeisempty = 0; } /* write a line, given two points and the transformation matrix. */ -static void line(struct swfoutput*obj, TAG*tag, plotxy p0, plotxy p1, struct swfmatrix*m) +/*static void line(struct swfoutput*obj, TAG*tag, plotxy p0, plotxy p1) { - transform(&p0,m); - transform(&p1,m); moveto(obj, tag, p0); lineto(obj, tag, p1); -} - -/* write a cubic (!) spline. This involves calling the approximate() - function out of spline.cc to convert it to a quadratic spline. */ -static void spline(struct swfoutput*obj, TAG*tag,plotxy p0,plotxy p1,plotxy p2,plotxy p3,struct swfmatrix*m) -{ - swfoutput_internal*i = (swfoutput_internal*)obj->internal; - double d; - struct qspline q[128]; - int num; - int t; - transform(&p0,m); - transform(&p1,m); - transform(&p2,m); - transform(&p3,m); - cspline c; - c.start = p3; - c.control1 = p2; - c.control2 = p1; - c.end = p0; - - if(i->storefont) { - /* fonts use a different approximation than shapes */ - num = cspline_approximate(&c, q, config_fontsplinemaxerror/20.0, APPROXIMATE_RECURSIVE_BINARY); - //num = cspline_approximate(&c, q, 10.0, APPROXIMATE_INFLECTION); - } else { - num = cspline_approximate(&c, q, config_splinemaxerror/20.0, APPROXIMATE_RECURSIVE_BINARY); - } - for(t=0;tinternal; if( i->tag->id != ST_DEFINESHAPE && @@ -343,14 +405,14 @@ void drawpath(struct swfoutput*obj, SWF_OUTLINE*outline, struct swfmatrix*m, int y += (outline->dest.y/(float)0xffff); if(outline->type == SWF_PATHTYPE_MOVE) { - //if(!init && fill && obj->drawmode != DRAWMODE_EOFILL && !ignoredraworder) { + //if(!init && fill && obj->drawmode != DRAWMODE_EOFILL && !ignoredraworder) if(config_filloverlap && !init && i->fill && obj->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(obj,0); + // 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(obj); startshape(obj); startFill(obj); } @@ -366,7 +428,7 @@ void drawpath(struct swfoutput*obj, SWF_OUTLINE*outline, struct swfmatrix*m, int p1.x=firstx; p1.y=firsty; if(log) printf("fix: %f,%f -> %f,%f\n",p0.x,p0.y,p1.x,p1.y); - line(obj,i->tag, p0, p1, m); + line(obj,i->tag, p0, p1); } firstx=x; firsty=y; @@ -381,26 +443,8 @@ void drawpath(struct swfoutput*obj, SWF_OUTLINE*outline, struct swfmatrix*m, int p1.x=x; p1.y=y; if(log) printf("line: %f,%f -> %f,%f\n",p0.x,p0.y,p1.x,p1.y); - line(obj,i->tag, p0,p1,m); + line(obj,i->tag, p0,p1); } - else if(outline->type == SWF_PATHTYPE_BEZIER) - { - plotxy p0; - plotxy p1; - plotxy p2; - plotxy p3; - SWF_BEZIERSEGMENT*o2 = (SWF_BEZIERSEGMENT*)outline; - p0.x=x; - p0.y=y; - p1.x=o2->C.x/(float)0xffff+lastx; - p1.y=o2->C.y/(float)0xffff+lasty; - p2.x=o2->B.x/(float)0xffff+lastx; - p2.y=o2->B.y/(float)0xffff+lasty; - p3.x=lastx; - p3.y=lasty; - if(log) printf("spline: %f,%f -> %f,%f\n",p3.x,p3.y,p0.x,p0.y); - spline(obj,i->tag,p0,p1,p2,p3,m); - } else { msg(" drawpath: unknown outline type:%d\n", outline->type); } @@ -419,419 +463,9 @@ void drawpath(struct swfoutput*obj, SWF_OUTLINE*outline, struct swfmatrix*m, int p1.x=firstx; p1.y=firsty; if(log) printf("fix: %f,%f -> %f,%f\n",p0.x,p0.y,p1.x,p1.y); - line(obj, i->tag, p0, p1, m); - } -} - -plotxy getPivot(struct swfoutput*obj, SWF_OUTLINE*outline, int dir, double line_width, int end, int trytwo) -{ - swfoutput_internal*i = (swfoutput_internal*)obj->internal; - SWF_PATHPOINT next, next2; - double xv=0,yv=0, xv2=0, yv2=0; - plotxy p; - int two = 0; - - if(!end) { - if(outline->type == SWF_PATHTYPE_LINE) { - next = outline->dest; - } else { - next = ((SWF_BEZIERSEGMENT*)outline)->B; - if(next.x==0 && next.y==0) { - next = ((SWF_BEZIERSEGMENT*)outline)->C; - } - if(next.x==0 && next.y==0) { - next = ((SWF_BEZIERSEGMENT*)outline)->dest; - } - } - next2 = next; - if(trytwo && outline->last && outline->last->type != SWF_PATHTYPE_MOVE) { - if(outline->type == SWF_PATHTYPE_LINE) { - next2 = outline->last->dest; - } else { - 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) { - next2.x = outline->last->dest.x - b.x; - next2.y = outline->last->dest.y - b.y; - } - if(next2.x==0 && next2.y==0) { - next2.x = outline->last->dest.x; - next2.y = outline->last->dest.y; - } - } - two = 1; - } - } else { - if(outline->type == SWF_PATHTYPE_LINE) { - next = outline->dest; - } else { - 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) { - next.x = outline->dest.x - b.x; - next.y = outline->dest.y - b.y; - } - if(next.x==0 && next.y==0) { - next.x = outline->dest.x; - next.y = outline->dest.y; - } - } - next2 = next; - if(trytwo && outline->link && outline->link->type != SWF_PATHTYPE_MOVE) { - if(outline->type == SWF_PATHTYPE_LINE) { - next2 = outline->link->dest; - } else { - next2 = ((SWF_BEZIERSEGMENT*)(outline->link))->B; - if(next2.x==0 && next2.y==0) { - next2 = ((SWF_BEZIERSEGMENT*)outline->link)->C; - } - if(next2.x==0 && next2.y==0) { - next2 = ((SWF_BEZIERSEGMENT*)outline->link)->dest; - } - } - two = 1; - } - } - - if(dir) { - xv = next.y/(float)0xffff; - yv = -next.x/(float)0xffff; - } else { - xv = -next.y/(float)0xffff; - yv = next.x/(float)0xffff; - } - - double r = (line_width/2)/sqrt(xv*xv+yv*yv); - xv*=r; - yv*=r; - - if(two) { - if(dir) { - xv2 = next2.y/(float)0xffff; - yv2 = -next2.x/(float)0xffff; - } else { - xv2 = -next2.y/(float)0xffff; - yv2 = next2.x/(float)0xffff; - } - - double r2 = (line_width/2)/sqrt(xv2*xv2+yv2*yv2); - xv2*=r2; - yv2*=r2; - xv = (xv+xv2)/2; - yv = (yv+yv2)/2; - double r3 = (line_width/2)/sqrt(xv*xv+yv*yv); - xv *= r3; - yv *= r3; - } - - p.x = xv; - p.y = yv; - return p; -} - -void drawShortPath(struct swfoutput*obj, double x, double y, struct swfmatrix* m, SWF_OUTLINE*outline) -{ - swfoutput_internal*i = (swfoutput_internal*)obj->internal; - double lastx=x, lasty=y; - while (outline && outline->type != SWF_PATHTYPE_MOVE) - { - x += (outline->dest.x/(float)0xffff); - y += (outline->dest.y/(float)0xffff); - - if(outline->type == SWF_PATHTYPE_LINE) - { - plotxy p0, p1; - p0.x=lastx; - p0.y=lasty; - p1.x= x; - p1.y= y; - line(obj, i->tag, p0, p1, m); - } - else if(outline->type == SWF_PATHTYPE_BEZIER) - { - plotxy p0,p1,p2,p3; - SWF_BEZIERSEGMENT*o2 = (SWF_BEZIERSEGMENT*)outline; - p3.x=lastx; - p3.y=lasty; - p1.x=o2->C.x/(float)0xffff+lastx; - p1.y=o2->C.y/(float)0xffff+lasty; - p2.x=o2->B.x/(float)0xffff+lastx; - p2.y=o2->B.y/(float)0xffff+lasty; - p0.x=x; - p0.y=y; - spline(obj, i->tag,p0,p1,p2,p3,m); - } - lastx=x; - lasty=y; - outline = outline->link; - } -} - -void drawShortPathWithEnds(struct swfoutput*obj, double x, double y, struct swfmatrix* m, SWF_OUTLINE*outline, int num, int line_cap, int line_join, double line_width) -{ - swfoutput_internal*i = (swfoutput_internal*)obj->internal; - plotxy d,d2; - int back = 0; - - if(line_cap == LINE_CAP_BUTT || line_cap == LINE_CAP_SQUARE) { - endshape(obj,0); - startshape(obj); - 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 != SWF_PATHTYPE_MOVE) { - last = tmp; - lx += (tmp->dest.x/(float)0xffff); - ly += (tmp->dest.y/(float)0xffff); - tmp = tmp->link; - } - s = getPivot(obj, outline, 0, line_width, 0, 0); - e = getPivot(obj, last, 0, line_width, 1, 0); - - if(line_cap == LINE_CAP_BUTT) { - /* make the clipping rectangle slighly bigger - than the line ending, so that it get's clipped - propertly */ - //ee = 1.01; - ee=1.0; - } - - p0.x = x2 + s.x*ee; - p0.y = y2 + s.y*ee; - p1.x = x2 - s.x*ee; - p1.y = y2 - s.y*ee; - p2.x = x2 - s.y - s.x*ee; - p2.y = y2 + s.x - s.y*ee; - p3.x = x2 - s.y + s.x*ee; - p3.y = y2 + s.x + s.y*ee; - m0.x = lx + e.x*ee; - m0.y = ly + e.y*ee; - m1.x = lx - e.x*ee; - m1.y = ly - e.y*ee; - m2.x = lx + e.y - e.x*ee; - m2.y = ly - e.x - e.y*ee; - m3.x = lx + e.y + e.x*ee; - m3.y = ly - e.x + e.y*ee; - - for(nr=0;nr<2;nr++) { - int dir=0; - struct plotxy q0,q1,q2,q3,q4,q5; - - startFill(obj); - if(line_cap == LINE_CAP_BUTT) { - if(dir) { - /* FIXME: box should be smaller */ - q0.x = 0; q0.y = 0; - q1.x = i->sizex; q1.y = 0; - q2.x = i->sizex; q2.y = i->sizey; - q3.x = 0; q3.y = i->sizey; - } else { - /* FIXME: box should be smaller */ - q0.x = i->sizex; q0.y = i->sizey; - q1.x = 0; q1.y = i->sizey; - q2.x = 0; q2.y = 0; - q3.x = i->sizex; q3.y = 0; - } - q4.x = p0.x; - q4.y = p0.y; - moveto(obj, i->tag, q0); - lineto(obj, i->tag, q1); - lineto(obj, i->tag, q2); - lineto(obj, i->tag, q3); - lineto(obj, i->tag, q0); - - transform(&q4,m); - lineto(obj, i->tag, q4); - } - - line(obj, i->tag, p0, p1, m); - line(obj, i->tag, p1, p2, m); - line(obj, i->tag, p2, p3, m); - line(obj, i->tag, p3, p0, m); - - if(line_cap == LINE_CAP_BUTT) { - lineto(obj, i->tag, q0); - endshape(obj, i->depth+2-nr); - startshape(obj); - } - p0 = m0; - p1 = m1; - p2 = m2; - p3 = m3; - } - - stopFill(obj); - } - - drawShortPath(obj,x,y,m,outline); - - if(line_cap == LINE_CAP_BUTT) { - endshape(obj,0); - startshape(obj); - } -} - -void drawT1toRect(struct swfoutput*obj, double x, double y, struct swfmatrix* m, SWF_OUTLINE*outline, int num, int line_cap, int line_join, double line_width) -{ - swfoutput_internal*i = (swfoutput_internal*)obj->internal; - plotxy d1,d2,p1,p2,p3,p4; - - d1.x = (outline->dest.x/(float)0xffff); - d1.y = (outline->dest.y/(float)0xffff); - d2 = getPivot(obj, outline, 0, line_width, 0, 0); - - assert(line_cap != LINE_CAP_ROUND); - if(line_cap == LINE_CAP_SQUARE) { - x -= +d2.y; - y -= -d2.x; - d1.x += +2*d2.y; - d1.y += -2*d2.x; - } - - p1.x = x + d2.x; - p1.y = y + d2.y; - p2.x = x + d2.x + d1.x; - p2.y = y + d2.y + d1.y; - p3.x = x - d2.x + d1.x; - p3.y = y - d2.y + d1.y; - p4.x = x - d2.x; - p4.y = y - d2.y; - - line(obj, i->tag, p1,p2, m); - line(obj, i->tag, p2,p3, m); - line(obj, i->tag, p3,p4, m); - line(obj, i->tag, p4,p1, m); -} - -void drawShortPathWithStraightEnds(struct swfoutput*obj, double x, double y, struct swfmatrix* m, SWF_OUTLINE*outline, int num, int line_cap, int line_join, double line_width) -{ - swfoutput_internal*i = (swfoutput_internal*)obj->internal; - SWF_OUTLINE*tmp=outline; - double xx=x,yy=y; - int stop=0; - assert(i->shapeid>=0); - - startFill(obj); - drawT1toRect(obj, x, y, m,outline, num, line_cap, line_join, line_width); - - 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 == SWF_PATHTYPE_LINE); - assert(outline->type == SWF_PATHTYPE_LINE); - - if(tmp!=outline) { - - if(outline->link == tmp) { - /* the two straight line segments (which are everything we - 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(obj,0);startshape(obj); - startFill(obj); - } - - drawT1toRect(obj, xx, yy, m, tmp, num, line_cap, line_join, line_width); - - if(outline->link != tmp) - { - stopFill(obj);stop=1; - int save= tmp->type; - tmp->type = SWF_PATHTYPE_MOVE; - x += (outline->dest.x/(float)0xffff); - y += (outline->dest.y/(float)0xffff); - outline = outline->link; - drawShortPath(obj, x, y, m, outline); - tmp->type = save; - } + line(obj, i->tag, p0, p1); } - if(!stop) - stopFill(obj); -} - -static int t1len(struct swfoutput*obj, SWF_OUTLINE*line) -{ - swfoutput_internal*i = (swfoutput_internal*)obj->internal; - int num=0; - while(line && line->type != SWF_PATHTYPE_MOVE) { - num++; - line = line->link; - } - return num; -} - -static float t1linelen(struct swfoutput*obj, SWF_OUTLINE*line) -{ - swfoutput_internal*i = (swfoutput_internal*)obj->internal; - float x,y; - x = (line->dest.x/(float)0xffff); - y = (line->dest.y/(float)0xffff); - return sqrt(x*x+y*y); -} - -void drawpath2poly(struct swfoutput *obj, SWF_OUTLINE*outline, struct swfmatrix*m, int log, int line_join, int line_cap, double line_width, double miter_limit) -{ - swfoutput_internal*i = (swfoutput_internal*)obj->internal; - if( i->tag->id != ST_DEFINESHAPE && - i->tag->id != ST_DEFINESHAPE2 && - i->tag->id != ST_DEFINESHAPE3) { - msg(" internal error: drawpath needs a shape tag, not %d\n",i->tag->id); - exit(1); - } - assert(i->shapeid>=0); - double x=0,y=0; - double lastx=0,lasty=0; - int valid = 0; - int lastwasline = 0; - SWF_OUTLINE*tmp = outline, *last = 0; - tmp->last = 0; - - while(1) { - if(tmp) { - x += (tmp->dest.x/(float)0xffff); - y += (tmp->dest.y/(float)0xffff); - } - if(!tmp || tmp->type == SWF_PATHTYPE_MOVE) { - if(valid && last) { - if(last->type == SWF_PATHTYPE_LINE && t1linelen(obj,last)>line_width*2 && - lastwasline && line_cap != LINE_CAP_ROUND) - drawShortPathWithStraightEnds(obj, lastx, lasty, m, last, valid, line_cap, line_join, line_width); - else - drawShortPathWithEnds(obj, lastx, lasty, m, last, valid, line_cap, line_join, line_width); - } - if(!tmp) - break; - valid = 0; - last = 0; - lastx = x; - lasty = y; - } else { - if(!last) - last = tmp; - valid++; - } - - if(tmp && tmp->type == SWF_PATHTYPE_LINE && t1linelen(obj,tmp)>line_width*2) - lastwasline = 1; - else - lastwasline = 0; - - if(tmp->link) - tmp->link->last = tmp; // make sure list is properly linked in both directions - tmp = tmp->link; - } -} +}*/ static inline int colorcompare(struct swfoutput*obj, RGBA*a,RGBA*b) { @@ -1041,8 +675,7 @@ static void putcharacters(struct swfoutput*obj, TAG*tag) i->chardatapos = 0; } -static void putcharacter(struct swfoutput*obj, int fontid, int charid, - int x,int y, int size) +static void putcharacter(struct swfoutput*obj, int fontid, int charid, int x,int y, int size, RGBA color) { swfoutput_internal*i = (swfoutput_internal*)obj->internal; if(i->chardatapos == CHARDATAMAX) @@ -1055,7 +688,7 @@ static void putcharacter(struct swfoutput*obj, int fontid, int charid, i->chardata[i->chardatapos].charid = charid; i->chardata[i->chardatapos].x = x; i->chardata[i->chardatapos].y = y; - i->chardata[i->chardatapos].color = obj->fillrgb; + i->chardata[i->chardatapos].color = color; i->chardata[i->chardatapos].size = size; i->chardatapos++; } @@ -1066,7 +699,7 @@ static void putcharacter(struct swfoutput*obj, int fontid, int charid, #define FONT_INTERNAL_SIZE 4 /* process a character. */ -static int drawchar(struct swfoutput*obj, SWFFONT *swffont, char*character, int charnr, int u, swfmatrix*m) +static int drawchar(struct swfoutput*obj, SWFFONT *swffont, char*character, int charnr, int u, swfmatrix*m, gfxcolor_t*col) { swfoutput_internal*i = (swfoutput_internal*)obj->internal; if(!swffont) { @@ -1081,9 +714,15 @@ static int drawchar(struct swfoutput*obj, SWFFONT *swffont, char*character, int FIXNULL(character),charnr, u, FIXNULL((char*)swffont->name), swffont->numchars); return 0; } + /*if(swffont->glyph[charid].shape->bitlen <= 16) { + msg(" Character '%s' (c=%d,u=%d), glyph %d in current charset (%s, %d characters) is empty", + FIXNULL(character),charnr, u, charid, FIXNULL((char*)swffont->name), swffont->numchars); + return 0; + }*/ + if(i->shapeid>=0) - endshape(obj,0); + endshape(obj); if(i->textid<0) starttext(obj); @@ -1100,7 +739,8 @@ static int drawchar(struct swfoutput*obj, SWFFONT *swffont, char*character, int 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); + RGBA rgba = *(RGBA*)col; + putcharacter(obj, swffont->id, charid,p.x,p.y,FONT_INTERNAL_SIZE, rgba); swf_FontUseGlyph(swffont, charid); return 1; @@ -1150,7 +790,7 @@ static void endtext(swfoutput*obj) swf_SetRect(i->tag,&r); MATRIX m; - swf_GetMatrix(0, &m); + swf_GetMatrix(0, &m); /* set unit matrix- the real matrix is in the placeobject */ swf_SetMatrix(i->tag,&m); putcharacters(obj, i->tag); @@ -1160,52 +800,10 @@ static void endtext(swfoutput*obj) MATRIX m2; swf_MatrixJoin(&m2,&obj->fontmatrix, &i->page_matrix); - swf_ObjectPlace(i->tag,i->textid,/*depth*/i->depth++,&m2,NULL,NULL); + swf_ObjectPlace(i->tag,i->textid,/*depth*/++i->depth,&m2,NULL,NULL); i->textid = -1; } - -/* draw a curved polygon. */ -void swfoutput_drawpath(swfoutput*obj, SWF_OUTLINE*outline, - struct swfmatrix*m) -{ - swfoutput_internal*i = (swfoutput_internal*)obj->internal; - if(i->textid>=0) - endtext(obj); - - /* Multiple polygons in one shape don't overlap correctly, - so we better start a new shape here if the polygon is filled - */ - if(i->shapeid>=0 && i->fill && !config_ignoredraworder) { - endshape(obj,0); - } - - if(i->shapeid<0) { - startshape(obj); - } - - if(!i->fill) - stopFill(obj); - else - startFill(obj); - - drawpath(obj, outline,m, 0); -} - -void swfoutput_drawpath2poly(struct swfoutput*obj, SWF_OUTLINE*outline, struct swfmatrix*m, int line_join, int line_cap, double line_width, double miter_limit) -{ - swfoutput_internal*i = (swfoutput_internal*)obj->internal; - if(i->textid>=0) - endtext(obj); - if(i->shapeid>=0) - endshape(obj,0); - assert(i->shapeid<0); - startshape(obj); - stopFill(obj); - - drawpath2poly(obj, outline, m, 0, line_join, line_cap, line_width, miter_limit); -} - int getCharID(SWFFONT *font, int charnr, char *charname, int u) { int t; @@ -1309,12 +907,12 @@ void swfoutput_setfont(struct swfoutput*obj, char*fontid, char*filename) } } if(bad>5) { - msg(" Font %s has bad unicode mapping", swffont->name); + msg(" Font %s has bad unicode mapping", fontid); swffont->encoding = 255; } } - swf_FontSetID(swffont, ++i->currentswfid); + swf_FontSetID(swffont, getNewID(obj)); if(getScreenLogLevel() >= LOGLEVEL_DEBUG) { // print font information @@ -1396,7 +994,7 @@ void swfoutput_setfontmatrix(struct swfoutput*obj,double m11,double m12, } /* draws a character at x,y. */ -int swfoutput_drawchar(struct swfoutput* obj,double x,double y,char*character, int charnr, int u) +int swfoutput_drawchar(struct swfoutput* obj,double x,double y,char*character, int charnr, int u, gfxcolor_t* color) { swfoutput_internal*i = (swfoutput_internal*)obj->internal; swfmatrix m; @@ -1406,18 +1004,27 @@ int swfoutput_drawchar(struct swfoutput* obj,double x,double y,char*character, i m.m22 = obj->fontm22; m.m13 = x; m.m23 = y; - return drawchar(obj, obj->swffont, character, charnr, u, &m); + return drawchar(obj, obj->swffont, character, charnr, u, &m, color); } static void endpage(struct swfoutput*obj) { swfoutput_internal*i = (swfoutput_internal*)obj->internal; if(i->shapeid>=0) - endshape(obj,0); + endshape(obj); if(i->textid>=0) endtext(obj); while(i->clippos) swfoutput_endclip(obj); + i->pagefinished = 1; +} + +void swfoutput_pagefeed(struct swfoutput*obj) +{ + swfoutput_internal*i = (swfoutput_internal*)obj->internal; + + if(!i->pagefinished) + endpage(obj); if(config_insertstoptag) { ActionTAG*atag=0; @@ -1427,81 +1034,91 @@ static void endpage(struct swfoutput*obj) swf_ActionSet(i->tag,atag); } i->tag = swf_InsertTag(i->tag,ST_SHOWFRAME); + i->frameno ++; + + for(i->depth;i->depth>i->startdepth;i->depth--) { + i->tag = swf_InsertTag(i->tag,ST_REMOVEOBJECT2); + swf_SetU16(i->tag,i->depth); + } + i->depth = i->startdepth; +} + +static void setBackground(struct swfoutput*obj, int x1, int y1, int x2, int y2) +{ + swfoutput_internal*i = (swfoutput_internal*)obj->internal; + RGBA rgb; + rgb.a = rgb.r = rgb.g = rgb.b = 0xff; + SRECT r; + SHAPE* s; + int ls1=0,fs1=0; + int shapeid = getNewID(obj); + r.xmin = x1; + r.ymin = y1; + r.xmax = x2; + r.ymax = y2; + i->tag = swf_InsertTag(i->tag, ST_DEFINESHAPE); + swf_ShapeNew(&s); + fs1 = swf_ShapeAddSolidFillStyle(s, &rgb); + swf_SetU16(i->tag,shapeid); + swf_SetRect(i->tag,&r); + swf_SetShapeHeader(i->tag,s); + swf_ShapeSetAll(i->tag,s,x1,y1,ls1,fs1,0); + swf_ShapeSetLine(i->tag,s,(x2-x1),0); + swf_ShapeSetLine(i->tag,s,0,(y2-y1)); + swf_ShapeSetLine(i->tag,s,(x1-x2),0); + swf_ShapeSetLine(i->tag,s,0,(y1-y2)); + swf_ShapeSetEnd(i->tag); + swf_ShapeFree(s); + i->tag = swf_InsertTag(i->tag, ST_PLACEOBJECT2); + swf_ObjectPlace(i->tag,shapeid,++i->depth,0,0,0); + i->tag = swf_InsertTag(i->tag, ST_PLACEOBJECT2); + swf_ObjectPlaceClip(i->tag,shapeid,++i->depth,0,0,0,65535); + i->cliptag = i->tag; } void swfoutput_newpage(struct swfoutput*obj, int pageNum, int movex, int movey, int x1, int y1, int x2, int y2) { swfoutput_internal*i = (swfoutput_internal*)obj->internal; - if(!i->firstpage) + if(!i->firstpage && !i->pagefinished) endpage(obj); swf_GetMatrix(0, &i->page_matrix); i->page_matrix.tx = movex*20; i->page_matrix.ty = movey*20; - for(i->depth--;i->depth>=i->startdepth;i->depth--) { - i->tag = swf_InsertTag(i->tag,ST_REMOVEOBJECT2); - swf_SetU16(i->tag,i->depth); + if(i->cliptag && i->frameno == i->lastframeno) { + SWFPLACEOBJECT obj; + swf_GetPlaceObject(i->cliptag, &obj); + obj.clipdepth = i->depth; + swf_ResetTag(i->cliptag, i->cliptag->id); + swf_SetPlaceObject(i->cliptag, &obj); + swf_PlaceObjectFree(&obj); } - i->depth = i->startdepth = 3; /* leave room for clip and background rectangle */ - i->sizex = x2; - i->sizey = y2; - x1*=20;y1*=20;x2*=20;y2*=20; + i->min_x = x1; + i->min_y = y1; + i->max_x = x2; + i->max_y = y2; + + msg(" processing page %d (%dx%d:%d:%d)", pageNum,x2-x1,y2-y1, x1, y1); - if(i->lastpagesize.xmin != x1 || - i->lastpagesize.xmax != x2 || - i->lastpagesize.ymin != y1 || - i->lastpagesize.ymax != y2) - {/* add white clipping rectangle */ - msg(" processing page %d (%dx%d)", pageNum,i->sizex,i->sizey); - - if(!i->firstpage) { - msg(" Page has a different size than previous ones"); - i->tag = swf_InsertTag(i->tag,ST_REMOVEOBJECT2); - swf_SetU16(i->tag,1); - i->tag = swf_InsertTag(i->tag,ST_REMOVEOBJECT2); - swf_SetU16(i->tag,2); - } + x1*=20;y1*=20;x2*=20;y2*=20; - RGBA rgb; - rgb.a = rgb.r = rgb.g = rgb.b = 0xff; - SRECT r; - SHAPE* s; - int ls1=0,fs1=0; - int shapeid = ++i->currentswfid; - r.xmin = x1; - r.ymin = y1; - r.xmax = x2; - r.ymax = y2; - i->tag = swf_InsertTag(i->tag, ST_DEFINESHAPE); - swf_ShapeNew(&s); - fs1 = swf_ShapeAddSolidFillStyle(s, &rgb); - swf_SetU16(i->tag,shapeid); - swf_SetRect(i->tag,&r); - swf_SetShapeHeader(i->tag,s); - swf_ShapeSetAll(i->tag,s,x1,y1,ls1,fs1,0); - swf_ShapeSetLine(i->tag,s,(x2-x1),0); - swf_ShapeSetLine(i->tag,s,0,(y2-y1)); - swf_ShapeSetLine(i->tag,s,(x1-x2),0); - swf_ShapeSetLine(i->tag,s,0,(y1-y2)); - swf_ShapeSetEnd(i->tag); - swf_ShapeFree(s); - i->tag = swf_InsertTag(i->tag, ST_PLACEOBJECT2); - swf_ObjectPlace(i->tag,shapeid,/*depth*/1,0,0,0); - i->tag = swf_InsertTag(i->tag, ST_PLACEOBJECT2); - swf_ObjectPlaceClip(i->tag,shapeid,/*depth*/2,0,0,0,65535); - } else { - msg(" processing page %d", pageNum); - } + /* set clipping/background rectangle */ + /* TODO: this should all be done in SWFOutputDev */ + setBackground(obj, x1, y1, x2, y2); - i->lastpagesize.xmin = x1; - i->lastpagesize.xmax = x2; - i->lastpagesize.ymin = y1; - i->lastpagesize.ymax = y2; - swf_ExpandRect2(&obj->swf.movieSize, &i->lastpagesize); + /* increase SWF's bounding box */ + SRECT r; + r.xmin = x1; + r.ymin = y1; + r.xmax = x2; + r.ymax = y2; + swf_ExpandRect2(&i->swf.movieSize, &r); + i->lastframeno = i->frameno; i->firstpage = 0; + i->pagefinished = 0; } /* initialize the swf writer */ @@ -1509,29 +1126,28 @@ void swfoutput_init(struct swfoutput* obj) { memset(obj, 0, sizeof(struct swfoutput)); obj->internal = init_internal_struct(); + ((swfoutput_internal*)obj->internal)->obj = obj; swfoutput_internal*i = (swfoutput_internal*)obj->internal; SRECT r; RGBA rgb; - msg(" initializing swf output for size %d*%d\n", i->sizex,i->sizey); + msg(" initializing swf output for size %d*%d\n", i->max_x,i->max_y); obj->swffont = 0; - obj->drawmode = -1; - memset(&obj->swf,0x00,sizeof(SWF)); - memset(&i->lastpagesize,0x00,sizeof(SRECT)); - - obj->swf.fileVersion = config_flashversion; - obj->swf.frameRate = 0x0040; // 1 frame per 4 seconds - obj->swf.movieSize.xmin = 0; - obj->swf.movieSize.ymin = 0; - obj->swf.movieSize.xmax = 0; - obj->swf.movieSize.ymax = 0; + memset(&i->swf,0x00,sizeof(SWF)); + + i->swf.fileVersion = config_flashversion; + i->swf.frameRate = 0x0040; // 1 frame per 4 seconds + i->swf.movieSize.xmin = 0; + i->swf.movieSize.ymin = 0; + i->swf.movieSize.xmax = 0; + i->swf.movieSize.ymax = 0; - obj->swf.firstTag = swf_InsertTag(NULL,ST_SETBACKGROUNDCOLOR); - i->tag = obj->swf.firstTag; + i->swf.firstTag = swf_InsertTag(NULL,ST_SETBACKGROUNDCOLOR); + i->tag = i->swf.firstTag; rgb.a = rgb.r = rgb.g = rgb.b = 0xff; swf_SetRGB(i->tag,&rgb); @@ -1544,9 +1160,11 @@ void swfoutput_init(struct swfoutput* obj) static void startshape(struct swfoutput*obj) { swfoutput_internal*i = (swfoutput_internal*)obj->internal; - RGBA rgb; SRECT r; + if(i->shapeid>=0) + return; + if(i->textid>=0) endtext(obj); @@ -1554,19 +1172,20 @@ static void startshape(struct swfoutput*obj) swf_ShapeNew(&i->shape); i->linestyleid = swf_ShapeAddLineStyle(i->shape,i->linewidth,&obj->strokergb); - rgb.r = obj->fillrgb.r; - rgb.g = obj->fillrgb.g; - rgb.b = obj->fillrgb.b; i->fillstyleid = swf_ShapeAddSolidFillStyle(i->shape,&obj->fillrgb); - i->shapeid = ++i->currentswfid; + i->shapeid = getNewID(obj); + + msg(" Using shape id %d", i->shapeid); + swf_SetU16(i->tag,i->shapeid); // ID i->bboxrectpos = i->tag->len; + /* changed later */ r.xmin = 0; r.ymin = 0; - r.xmax = 20*i->sizex; - r.ymax = 20*i->sizey; + r.xmax = 20*i->max_x; + r.ymax = 20*i->max_y; swf_SetRect(i->tag,&r); memset(&i->bboxrect, 0, sizeof(i->bboxrect)); @@ -1586,9 +1205,9 @@ static void starttext(struct swfoutput*obj) { swfoutput_internal*i = (swfoutput_internal*)obj->internal; if(i->shapeid>=0) - endshape(obj,0); + endshape(obj); - i->textid = ++i->currentswfid; + i->textid = getNewID(obj); i->swflastx=i->swflasty=0; } @@ -1680,22 +1299,29 @@ static void endshape_noput(swfoutput*obj) swf_ShapeFree(i->shape); i->shape=0; } + i->fill=0; } -static void endshape(swfoutput*obj, int clipdepth) +static void endshape(swfoutput*obj) { swfoutput_internal*i = (swfoutput_internal*)obj->internal; if(i->shapeid<0) return; - if(!clipdepth) - fixAreas(obj); + fixAreas(obj); if(i->shapeisempty || + /*bbox empty?*/ (i->bboxrect.xmin == i->bboxrect.xmax && - i->bboxrect.ymin == i->bboxrect.ymax)) + i->bboxrect.ymin == i->bboxrect.ymax)) { // delete the shape again, we didn't do anything + msg(" cancelling shape: bbox is (%f,%f,%f,%f)", + i->bboxrect.xmin /20.0, + i->bboxrect.ymin /20.0, + i->bboxrect.xmax /20.0, + i->bboxrect.ymax /20.0 + ); cancelshape(obj); return; } @@ -1704,26 +1330,48 @@ static void endshape(swfoutput*obj, int clipdepth) changeRect(obj, i->tag, i->bboxrectpos, &i->bboxrect); - i->tag = swf_InsertTag(i->tag,ST_PLACEOBJECT2); + msg(" Placing shape id %d", i->shapeid); - if(clipdepth) - swf_ObjectPlaceClip(i->tag,i->shapeid,i->depth++,&i->page_matrix,NULL,NULL,clipdepth); - else - swf_ObjectPlace(i->tag,i->shapeid,/*depth*/i->depth++,&i->page_matrix,NULL,NULL); + i->tag = swf_InsertTag(i->tag,ST_PLACEOBJECT2); + swf_ObjectPlace(i->tag,i->shapeid,/*depth*/++i->depth,&i->page_matrix,NULL,NULL); swf_ShapeFree(i->shape); i->shape = 0; i->shapeid = -1; i->bboxrectpos = -1; + i->fill=0; + + /*int debug = 1; + if(debug) { + char text[80]; + sprintf(text, "id%d", i->shapeid); + swfcoord points[4]; + points[0].x = i->bboxrect.xmin; + points[0].y = i->bboxrect.ymin; + points[1].x = i->bboxrect.xmax; + points[1].y = i->bboxrect.ymin; + points[2].x = i->bboxrect.xmax; + points[2].y = i->bboxrect.ymax; + points[3].x = i->bboxrect.xmin; + points[3].y = i->bboxrect.ymax; + swfoutput_namedlink(obj,text,points); + }*/ } -int swfoutput_save(struct swfoutput* obj, char*filename) +void swfoutput_finalize(struct swfoutput*obj) { swfoutput_internal*i = (swfoutput_internal*)obj->internal; + + if(i->tag && i->tag->id == ST_END) + return; //already done + + if(i->frameno == i->lastframeno) // fix: add missing pagefeed + swfoutput_pagefeed(obj); + endpage(obj); fontlist_t *tmp,*iterator = i->fontlist; while(iterator) { - TAG*mtag = obj->swf.firstTag; + TAG*mtag = i->swf.firstTag; if(iterator->swffont) { mtag = swf_InsertTag(mtag, ST_DEFINEFONT2); /*if(!storeallcharacters) @@ -1733,8 +1381,42 @@ int swfoutput_save(struct swfoutput* obj, char*filename) iterator = iterator->next; } - int fi; + i->tag = swf_InsertTag(i->tag,ST_END); + TAG* tag = i->tag->prev; + + /* remove the removeobject2 tags between the last ST_SHOWFRAME + and the ST_END- they confuse the flash player */ + while(tag->id == ST_REMOVEOBJECT2) { + TAG* prev = tag->prev; + swf_DeleteTag(tag); + tag = prev; + } +} + +SWF* swfoutput_get(struct swfoutput*obj) +{ + swfoutput_internal*i = (swfoutput_internal*)obj->internal; + + swfoutput_finalize(obj); + + return swf_CopySWF(&i->swf); +} + +void swfoutput_getdimensions(struct swfoutput*obj, int*x1, int*y1, int*x2, int*y2) +{ + swfoutput_internal*i = (swfoutput_internal*)obj->internal; + if(x1) *x1 = i->swf.movieSize.xmin/20; + if(y1) *y1 = i->swf.movieSize.ymin/20; + if(x2) *x2 = i->swf.movieSize.xmax/20; + if(y2) *y2 = i->swf.movieSize.ymax/20; +} + +int swfoutput_save(struct swfoutput* obj, char*filename) +{ + swfoutput_internal*i = (swfoutput_internal*)obj->internal; + swfoutput_finalize(obj); + int fi; if(filename) fi = open(filename, O_BINARY|O_CREAT|O_TRUNC|O_WRONLY, 0777); else @@ -1744,14 +1426,12 @@ int swfoutput_save(struct swfoutput* obj, char*filename) msg(" Could not create \"%s\". ", FIXNULL(filename)); return 0; } - - i->tag = swf_InsertTag(i->tag,ST_END); - + if(config_enablezlib || config_flashversion>=6) { - if FAILED(swf_WriteSWC(fi,&obj->swf)) + if FAILED(swf_WriteSWC(fi,&i->swf)) msg(" WriteSWC() failed.\n"); } else { - if FAILED(swf_WriteSWF(fi,&obj->swf)) + if FAILED(swf_WriteSWF(fi,&i->swf)) msg(" WriteSWF() failed.\n"); } @@ -1779,29 +1459,13 @@ void swfoutput_destroy(struct swfoutput* obj) iterator = iterator->next; delete tmp; } - swf_FreeTags(&obj->swf); + swf_FreeTags(&i->swf); free(i);i=0; memset(obj, 0, sizeof(swfoutput)); } -void swfoutput_setdrawmode(swfoutput* obj, int mode) -{ - swfoutput_internal*i = (swfoutput_internal*)obj->internal; - obj->drawmode = mode; - if(mode == DRAWMODE_FILL) - i->fill = 1; - else if(mode == DRAWMODE_EOFILL) - i->fill = 1; - else if(mode == DRAWMODE_STROKE) - i->fill = 0; - else if(mode == DRAWMODE_CLIP) - i->fill = 1; - else if(mode == DRAWMODE_EOCLIP) - i->fill = 1; -} - -void swfoutput_setfillcolor(swfoutput* obj, U8 r, U8 g, U8 b, U8 a) +static void swfoutput_setfillcolor(swfoutput* obj, U8 r, U8 g, U8 b, U8 a) { swfoutput_internal*i = (swfoutput_internal*)obj->internal; if(obj->fillrgb.r == r && @@ -1809,7 +1473,7 @@ void swfoutput_setfillcolor(swfoutput* obj, U8 r, U8 g, U8 b, U8 a) obj->fillrgb.b == b && obj->fillrgb.a == a) return; if(i->shapeid>=0) - endshape(obj,0); + endshape(obj); obj->fillrgb.r = r; obj->fillrgb.g = g; @@ -1817,7 +1481,7 @@ void swfoutput_setfillcolor(swfoutput* obj, U8 r, U8 g, U8 b, U8 a) obj->fillrgb.a = a; } -void swfoutput_setstrokecolor(swfoutput* obj, U8 r, U8 g, U8 b, U8 a) +static void swfoutput_setstrokecolor(swfoutput* obj, U8 r, U8 g, U8 b, U8 a) { swfoutput_internal*i = (swfoutput_internal*)obj->internal; if(obj->strokergb.r == r && @@ -1826,71 +1490,25 @@ void swfoutput_setstrokecolor(swfoutput* obj, U8 r, U8 g, U8 b, U8 a) obj->strokergb.a == a) return; if(i->shapeid>=0) - endshape(obj,0); + endshape(obj); obj->strokergb.r = r; obj->strokergb.g = g; obj->strokergb.b = b; obj->strokergb.a = a; } -void swfoutput_setlinewidth(struct swfoutput*obj, double _linewidth) +static void swfoutput_setlinewidth(struct swfoutput*obj, double _linewidth) { swfoutput_internal*i = (swfoutput_internal*)obj->internal; if(i->linewidth == (U16)(_linewidth*20)) return; if(i->shapeid>=0) - endshape(obj,0); + endshape(obj); i->linewidth = (U16)(_linewidth*20); } -void swfoutput_startclip(swfoutput*obj, SWF_OUTLINE*outline, struct swfmatrix*m) -{ - swfoutput_internal*i = (swfoutput_internal*)obj->internal; - if(i->textid>=0) - endtext(obj); - if(i->shapeid>=0) - endshape(obj,0); - - if(i->clippos >= 127) - { - msg(" Too many clip levels."); - i->clippos --; - } - - startshape(obj); - int olddrawmode = obj->drawmode; - swfoutput_setdrawmode(obj, DRAWMODE_CLIP); - swfoutput_drawpath(obj, outline, m); - swf_ShapeSetEnd(i->tag); - swfoutput_setdrawmode(obj, olddrawmode); - - i->tag = swf_InsertTag(i->tag,ST_PLACEOBJECT2); - i->cliptags[i->clippos] = i->tag; - i->clipshapes[i->clippos] = i->shapeid; - i->clipdepths[i->clippos] = i->depth++; - i->clippos++; - - endshape_noput(obj); -} - -void swfoutput_endclip(swfoutput*obj) -{ - swfoutput_internal*i = (swfoutput_internal*)obj->internal; - if(i->textid>=0) - endtext(obj); - if(i->shapeid>=0) - endshape(obj,0); - - if(!i->clippos) { - msg(" Invalid end of clipping region"); - return; - } - i->clippos--; - swf_ObjectPlaceClip(i->cliptags[i->clippos],i->clipshapes[i->clippos],i->clipdepths[i->clippos],&i->page_matrix,NULL,NULL,i->depth++); -} - static void drawlink(struct swfoutput*obj, ActionTAG*,ActionTAG*, swfcoord*points, char mouseover); void swfoutput_linktourl(struct swfoutput*obj, char*url, swfcoord*points) @@ -1908,7 +1526,7 @@ void swfoutput_linktourl(struct swfoutput*obj, char*url, swfcoord*points) } if(i->shapeid>=0) - endshape(obj,0); + endshape(obj); if(i->textid>=0) endtext(obj); @@ -1926,7 +1544,7 @@ void swfoutput_linktopage(struct swfoutput*obj, int page, swfcoord*points) ActionTAG* actions; if(i->shapeid>=0) - endshape(obj,0); + endshape(obj); if(i->textid>=0) endtext(obj); @@ -1947,7 +1565,7 @@ void swfoutput_namedlink(struct swfoutput*obj, char*name, swfcoord*points) char mouseover = 1; if(i->shapeid>=0) - endshape(obj,0); + endshape(obj); if(i->textid>=0) endtext(obj); @@ -2003,7 +1621,7 @@ static void drawlink(struct swfoutput*obj, ActionTAG*actions1, ActionTAG*actions double posx = 0; double posy = 0; int t; - int buttonid = ++i->currentswfid; + int buttonid = getNewID(obj); for(t=1;t<4;t++) { if(points[t].x>xmax) xmax=points[t].x; @@ -2011,7 +1629,7 @@ static void drawlink(struct swfoutput*obj, ActionTAG*actions1, ActionTAG*actions if(points[t].xcurrentswfid; + myshapeid = getNewID(obj); i->tag = swf_InsertTag(i->tag,ST_DEFINESHAPE3); swf_ShapeNew(&i->shape); rgb.r = rgb.b = rgb.a = rgb.g = 0; @@ -2049,7 +1667,7 @@ static void drawlink(struct swfoutput*obj, ActionTAG*actions1, ActionTAG*actions swf_ShapeSetEnd(i->tag); /* shape2 */ - myshapeid2 = ++i->currentswfid; + myshapeid2 = getNewID(obj); i->tag = swf_InsertTag(i->tag,ST_DEFINESHAPE3); swf_ShapeNew(&i->shape); rgb.r = rgb.b = rgb.a = rgb.g = 255; @@ -2120,244 +1738,189 @@ static void drawlink(struct swfoutput*obj, ActionTAG*actions1, ActionTAG*actions m = i->page_matrix; m.tx = p.x; m.ty = p.y; - swf_ObjectPlace(i->tag, buttonid, i->depth++,&m,0,0); - } - else { - swf_ObjectPlace(i->tag, buttonid, i->depth++,&i->page_matrix,0,0); + swf_ObjectPlace(i->tag, buttonid, ++i->depth,&m,0,0); + } else { + swf_ObjectPlace(i->tag, buttonid, ++i->depth,&i->page_matrix,0,0); } } -static void drawimage(struct swfoutput*obj, int bitid, int sizex,int sizey, - double x1,double y1, - double x2,double y2, - double x3,double y3, - double x4,double y4) + +/////////// +/* +for(t=0;tinternal; - RGBA rgb; - SRECT r; - int lsid=0; - int fsid; - struct plotxy p1,p2,p3,p4; - int myshapeid; - double xmax=x1,ymax=y1,xmin=x1,ymin=y1; - if(x2>xmax) xmax=x2; - if(y2>ymax) ymax=y2; - if(x2xmax) xmax=x3; - if(y3>ymax) ymax=y3; - if(x3xmax) xmax=x4; - if(y4>ymax) ymax=y4; - if(x4currentswfid; - i->tag = swf_InsertTag(i->tag,ST_DEFINESHAPE); - SHAPE*shape; - swf_ShapeNew(&shape); - //lsid = ShapeAddLineStyle(shape,linewidth,&obj->strokergb); - //fsid = ShapeAddSolidFillStyle(shape,&obj->fillrgb); - fsid = swf_ShapeAddBitmapFillStyle(shape,&m,bitid,1); - swf_SetU16(i->tag, myshapeid); - r.xmin = (int)(xmin*20); - r.ymin = (int)(ymin*20); - r.xmax = (int)(xmax*20); - r.ymax = (int)(ymax*20); - swf_SetRect(i->tag,&r); - swf_SetShapeStyles(i->tag,shape); - swf_ShapeCountBits(shape,NULL,NULL); - swf_SetShapeBits(i->tag,shape); - swf_ShapeSetAll(i->tag,shape,/*x*/0,/*y*/0,lsid,fsid,0); - i->swflastx = i->swflasty = 0; - moveto(obj, i->tag, p1); - lineto(obj, i->tag, p2); - lineto(obj, i->tag, p3); - lineto(obj, i->tag, p4); - lineto(obj, i->tag, p1); - /* - ShapeMoveTo (tag, shape, (int)(x1*20),(int)(y1*20)); - ShapeSetLine (tag, shape, (int)(x1*20); - ShapeSetLine (tag, shape, x*20,0); - ShapeSetLine (tag, shape, 0,-y*20); - ShapeSetLine (tag, shape, -x*20,0);*/ - swf_ShapeSetEnd(i->tag); - swf_ShapeFree(shape); - - /* instance */ - i->tag = swf_InsertTag(i->tag,ST_PLACEOBJECT2); - - swf_ObjectPlace(i->tag,myshapeid,/*depth*/i->depth++,&i->page_matrix,NULL,NULL); + gfxcoord_t lastx=0,lasty=0,px=0,py=0; + char lastwasmoveto; + 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(obj, 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(obj, i->tag, line->x, line->y); + px = line->x; + py = line->y; + lastwasmoveto = 0; + } else if(line->type == gfx_splineTo) { + msg(" ======== splineTo %.2f %.2f", line->x, line->y); + plotxy s,p; + s.x = line->sx;p.x = line->x; + s.y = line->sy;p.y = line->y; + splineto(obj, i->tag, s, p); + px = line->x; + py = line->y; + lastwasmoveto = 0; + } + line = line->next; + } } -int swfoutput_drawimagejpeg_old(struct swfoutput*obj, char*filename, int sizex,int sizey, - double x1,double y1, - double x2,double y2, - double x3,double y3, - double x4,double y4) +void swfoutput_drawgfxline(struct swfoutput*obj, gfxline_t*line, gfxcoord_t width, gfxcolor_t*col, gfx_capType cap_style, gfx_joinType joint_style, gfxcoord_t miterLimit) { swfoutput_internal*i = (swfoutput_internal*)obj->internal; - TAG*oldtag; - if(i->shapeid>=0) - endshape(obj,0); - if(i->textid>=0) - endtext(obj); - - int bitid = ++i->currentswfid; - oldtag = i->tag; - i->tag = swf_InsertTag(i->tag,ST_DEFINEBITSJPEG2); - swf_SetU16(i->tag, bitid); - if(swf_SetJPEGBits(i->tag, filename, config_jpegquality)<0) { - swf_DeleteTag(i->tag); - i->tag = oldtag; - return -1; - } - - drawimage(obj, bitid, sizex, sizey, x1,y1,x2,y2,x3,y3,x4,y4); - return bitid; + gfxdevice_t*dev = &i->device; + dev->stroke(dev, line, width, col, cap_style, joint_style, miterLimit); } - -int swfoutput_drawimagejpeg(struct swfoutput*obj, RGBA*mem, int sizex,int sizey, - double x1,double y1, - double x2,double y2, - double x3,double y3, - double x4,double y4) +void swfoutput_fillgfxline(struct swfoutput*obj, gfxline_t*line, gfxcolor_t*col) { swfoutput_internal*i = (swfoutput_internal*)obj->internal; - TAG*oldtag; - JPEGBITS*jpeg; - - if(i->shapeid>=0) - endshape(obj,0); - if(i->textid>=0) - endtext(obj); - - int bitid = ++i->currentswfid; - oldtag = i->tag; - i->tag = swf_InsertTag(i->tag,ST_DEFINEBITSJPEG2); - swf_SetU16(i->tag, bitid); - swf_SetJPEGBits2(i->tag,sizex,sizey,mem,config_jpegquality); - drawimage(obj, bitid, sizex, sizey, x1,y1,x2,y2,x3,y3,x4,y4); - return bitid; + gfxdevice_t*dev = &i->device; + dev->fill(dev, line, col); } - -int swfoutput_drawimagelossless(struct swfoutput*obj, RGBA*mem, int sizex,int sizey, - double x1,double y1, - double x2,double y2, - double x3,double y3, - double x4,double y4) +void swfoutput_startclip(struct swfoutput*obj, gfxline_t*line) { swfoutput_internal*i = (swfoutput_internal*)obj->internal; - TAG*oldtag; - if(i->shapeid>=0) - endshape(obj,0); - if(i->textid>=0) - endtext(obj); - - int bitid = ++i->currentswfid; - oldtag = i->tag; - i->tag = swf_InsertTag(i->tag,ST_DEFINEBITSLOSSLESS); - swf_SetU16(i->tag, bitid); - if(swf_SetLosslessBits(i->tag,sizex,sizey,mem, BMF_32BIT)<0) { - swf_DeleteTag(i->tag); - i->tag = oldtag; - return -1; - } - - drawimage(obj, bitid, sizex, sizey, x1,y1,x2,y2,x3,y3,x4,y4); - return bitid; + gfxdevice_t*dev = &i->device; + dev->startclip(dev, line); } +void swfoutput_endclip(struct swfoutput*obj) +{ + swfoutput_internal*i = (swfoutput_internal*)obj->internal; + gfxdevice_t*dev = &i->device; + dev->endclip(dev); +} + +#define IMAGE_TYPE_JPEG 0 +#define IMAGE_TYPE_LOSSLESS 1 -int swfoutput_drawimagelosslessN(struct swfoutput*obj, U8*mem, RGBA*pal, int sizex,int sizey, +static void swfoutput_drawimage(struct swfoutput*obj, RGBA* data, int sizex,int sizey, double x1,double y1, double x2,double y2, double x3,double y3, - double x4,double y4, int n) + double x4,double y4, int type) { swfoutput_internal*i = (swfoutput_internal*)obj->internal; - TAG*oldtag; - U8*mem2 = 0; - if(i->shapeid>=0) - endshape(obj,0); - if(i->textid>=0) - endtext(obj); - if(sizex&3) - { - /* SWF expects scanlines to be 4 byte aligned */ - int x,y; - U8*ptr; - mem2 = (U8*)malloc(BYTES_PER_SCANLINE(sizex)*sizey); - ptr = mem2; - for(y=0;ycurrentswfid; - oldtag = i->tag; - i->tag = swf_InsertTag(i->tag,ST_DEFINEBITSLOSSLESS2); - swf_SetU16(i->tag, bitid); - if(swf_SetLosslessBitsIndexed(i->tag,sizex,sizey,mem, pal, n)<0) { - swf_DeleteTag(i->tag); - i->tag = oldtag; - return -1; + {p1.x = (int)(p1.x*20)/20.0; + p1.y = (int)(p1.y*20)/20.0; + p2.x = (int)(p2.x*20)/20.0; + p2.y = (int)(p2.y*20)/20.0; + p3.x = (int)(p3.x*20)/20.0; + p3.y = (int)(p3.y*20)/20.0; + p4.x = (int)(p4.x*20)/20.0; + p4.y = (int)(p4.y*20)/20.0; + p5.x = (int)(p5.x*20)/20.0; + p5.y = (int)(p5.y*20)/20.0; } - if(mem2) - free(mem2); + + float m00,m10,tx; + float m01,m11,ty; + + gfxmatrix_t m; + m.m00 = (p4.x-p1.x)/sizex; m.m10 = (p2.x-p1.x)/sizey; + m.m01 = (p4.y-p1.y)/sizex; m.m11 = (p2.y-p1.y)/sizey; + m.tx = p1.x - 0.5; + m.ty = p1.y - 0.5; + + gfximage_t img; + img.data = (gfxcolor_t*)data; + img.width = sizex; + img.height = sizey; - drawimage(obj, bitid, sizex, sizey, x1,y1,x2,y2,x3,y3,x4,y4); - return bitid; + if(type == IMAGE_TYPE_JPEG) + /* TODO: pass image_dpi to device instead */ + i->device.setparameter(&i->device, "next_bitmap_is_jpeg", "1"); + + i->device.fillbitmap(&i->device, &p1, &img, &m, 0); } -void swfoutput_drawimageagain(struct swfoutput*obj, int id, int sizex,int sizey, - double x1,double y1, - double x2,double y2, - double x3,double y3, - double x4,double y4) +void swfoutput_drawimagejpeg(struct swfoutput*obj, RGBA*mem, int sizex,int sizey, + double x1,double y1, double x2,double y2, double x3,double y3, double x4,double y4) { - swfoutput_internal*i = (swfoutput_internal*)obj->internal; - if(id<0) return; - if(i->shapeid>=0) - endshape(obj,0); - if(i->textid>=0) - endtext(obj); + swfoutput_drawimage(obj,mem,sizex,sizey,x1,y1,x2,y2,x3,y3,x4,y4, IMAGE_TYPE_JPEG); +} - drawimage(obj, id, sizex, sizey, x1,y1,x2,y2,x3,y3,x4,y4); +void swfoutput_drawimagelossless(struct swfoutput*obj, RGBA*mem, int sizex,int sizey, + double x1,double y1, double x2,double y2, double x3,double y3, double x4,double y4) +{ + swfoutput_drawimage(obj,mem,sizex,sizey,x1,y1,x2,y2,x3,y3,x4,y4, IMAGE_TYPE_LOSSLESS); } void swfoutput_setparameter(char*name, char*value) { - if(!strcmp(name, "drawonlyshapes")) { + if(!strcmp(name, "jpegsubpixels")) { + config_jpegsubpixels = atof(value); + } else if(!strcmp(name, "ppmsubpixels")) { + config_ppmsubpixels = atof(value); + } else if(!strcmp(name, "drawonlyshapes")) { config_drawonlyshapes = atoi(value); } else if(!strcmp(name, "ignoredraworder")) { config_ignoredraworder = atoi(value); @@ -2379,6 +1942,8 @@ void swfoutput_setparameter(char*name, char*value) config_flashversion = atoi(value); } else if(!strcmp(name, "minlinewidth")) { config_minlinewidth = atof(value); + } else if(!strcmp(name, "caplinewidth")) { + config_caplinewidth = atof(value); } else if(!strcmp(name, "jpegquality")) { int val = atoi(value); if(val<0) val=0; @@ -2399,3 +1964,465 @@ void swfoutput_setparameter(char*name, char*value) } } +// -------------------------------------------------------------------- + +static CXFORM gfxcxform_to_cxform(gfxcxform_t* c) +{ + CXFORM cx; + swf_GetCXForm(0, &cx, 1); + if(!c) + return cx; + if(c->rg!=0 || c->rb!=0 || c->ra!=0 || + c->gr!=0 || c->gb!=0 || c->ga!=0 || + c->br!=0 || c->bg!=0 || c->ba!=0 || + c->ar!=0 || c->ag!=0 || c->ab!=0) + msg(" CXForm not SWF-compatible"); + + cx.a0 = (S16)(c->aa*256); + cx.r0 = (S16)(c->rr*256); + cx.g0 = (S16)(c->gg*256); + cx.b0 = (S16)(c->bb*256); + cx.a1 = c->t.a; + cx.r1 = c->t.r; + cx.g1 = c->t.g; + cx.b1 = c->t.b; + return cx; +} + +ArtSVP* gfxstrokeToSVP(gfxline_t*line, gfxcoord_t width, gfx_capType cap_style, gfx_joinType joint_style, double miterLimit) +{ + ArtVpath *vec = NULL; + ArtSVP *svp = NULL; + int pos=0,len=0; + gfxline_t*l2; + double x=0,y=0; + + 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))/3); + 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))/3); + 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; + + 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; +} + +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; + } +} + +static int add_image(swfoutput_internal*i, gfximage_t*img, int targetwidth, int targetheight, int* newwidth, int* newheight) +{ + swfoutput*obj = i->obj; + RGBA*newpic = 0; + RGBA*mem = (RGBA*)img->data; + int bitid = getNewID(obj); + + int sizex = img->width; + int sizey = img->height; + int is_jpeg = i->jpeg; + i->jpeg = 0; + + int newsizex=sizex, newsizey=sizey; + + /// { + if(is_jpeg && config_jpegsubpixels) { + newsizex = (int)(targetwidth*config_jpegsubpixels+0.5); + newsizey = (int)(targetheight*config_jpegsubpixels+0.5); + } else if(!is_jpeg && config_ppmsubpixels) { + newsizex = (int)(targetwidth*config_ppmsubpixels+0.5); + newsizey = (int)(targetheight*config_ppmsubpixels+0.5); + } + /// } + + if(sizex<=0 || sizey<=0 || newsizex<=0 || newsizey<=0) + return -1; + + /* TODO: cache images */ + *newwidth = sizex; + *newheight = sizey; + + if(newsizex Drawing %dx%d %s%simage at size %dx%d (%dx%d), %s%d colors", + sizex, sizey, + has_alpha?(has_alpha==2?"semi-transparent ":"transparent "):"", + is_jpeg?"jpeg-":"", + newsizex, newsizey, + targetwidth, targetheight, + /*newsizex, newsizey,*/ + num_colors>256?">":"", num_colors>256?256:num_colors); + + /*RGBA* pal = (RGBA*)rfx_alloc(sizeof(RGBA)*num_colors); + swf_ImageGetNumberOfPaletteEntries(mem,sizex,sizey,pal); + int t; + for(t=0;ttag = swf_AddImage(i->tag, bitid, mem, sizex, sizey, config_jpegquality); + + if(newpic) + free(newpic); + + return bitid; +} + +static SRECT gfxline_getSWFbbox(gfxline_t*line) +{ + gfxbbox_t bbox = gfxline_getbbox(line); + SRECT r; + r.xmin = (int)(bbox.xmin*20); + r.ymin = (int)(bbox.ymin*20); + r.xmax = (int)(bbox.xmax*20); + r.ymax = (int)(bbox.ymax*20); + return r; +} + +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; + swfoutput*obj = i->obj; + + endshape(obj); + endtext(obj); + + int targetx = (int)(sqrt(matrix->m00*matrix->m00 + matrix->m01*matrix->m01)*img->width); + int targety = (int)(sqrt(matrix->m10*matrix->m10 + matrix->m11*matrix->m11)*img->height); + + int newwidth=0,newheight=0; + int bitid = add_image(i, img, targetx, targety, &newwidth, &newheight); + if(bitid<0) + return; + double fx = (double)img->width / (double)newwidth; + double fy = (double)img->height / (double)newheight; + + MATRIX m; + float m00,m10,tx; + float m01,m11,ty; + m.sx = (int)(65536*20*matrix->m00*fx); m.r1 = (int)(65536*20*matrix->m10*fy); + m.r0 = (int)(65536*20*matrix->m01*fx); m.sy = (int)(65536*20*matrix->m11*fy); + m.tx = (int)(matrix->tx*20); + m.ty = (int)(matrix->ty*20); + + /* shape */ + int myshapeid = getNewID(obj); + i->tag = swf_InsertTag(i->tag,ST_DEFINESHAPE); + SHAPE*shape; + swf_ShapeNew(&shape); + int fsid = swf_ShapeAddBitmapFillStyle(shape,&m,bitid,1); + swf_SetU16(i->tag, myshapeid); + SRECT r = gfxline_getSWFbbox(line); + swf_SetRect(i->tag,&r); + swf_SetShapeStyles(i->tag,shape); + swf_ShapeCountBits(shape,NULL,NULL); + swf_SetShapeBits(i->tag,shape); + swf_ShapeSetAll(i->tag,shape,UNDEFINED_COORD,UNDEFINED_COORD,0,fsid,0); + i->swflastx = i->swflasty = UNDEFINED_COORD; + drawgfxline(obj, line); + swf_ShapeSetEnd(i->tag); + swf_ShapeFree(shape); + + i->tag = swf_InsertTag(i->tag,ST_PLACEOBJECT2); + CXFORM cxform2 = gfxcxform_to_cxform(cxform); + swf_ObjectPlace(i->tag,myshapeid,/*depth*/++i->depth,&i->page_matrix,&cxform2,NULL); +} + +void swf_startclip(gfxdevice_t*dev, gfxline_t*line) +{ + swfoutput_internal*i = (swfoutput_internal*)dev->internal; + swfoutput*obj = i->obj; + + endtext(obj); + endshape(obj); + + if(i->clippos >= 127) + { + msg(" Too many clip levels."); + i->clippos --; + } + + int myshapeid = getNewID(obj); + i->tag = swf_InsertTag(i->tag,ST_DEFINESHAPE); + RGBA col; + memset(&col, 0, sizeof(RGBA)); + SHAPE*shape; + swf_ShapeNew(&shape); + int fsid = swf_ShapeAddSolidFillStyle(shape,&col); + swf_SetU16(i->tag,myshapeid); + SRECT r = gfxline_getSWFbbox(line); + swf_SetRect(i->tag,&r); + swf_SetShapeStyles(i->tag,shape); + swf_ShapeCountBits(shape,NULL,NULL); + swf_SetShapeBits(i->tag,shape); + swf_ShapeSetAll(i->tag,shape,UNDEFINED_COORD,UNDEFINED_COORD,0,fsid,0); + i->swflastx = i->swflasty = UNDEFINED_COORD; + drawgfxline(obj, line); + swf_ShapeSetEnd(i->tag); + swf_ShapeFree(shape); + + /* TODO: remember the bbox, and check all shapes against it */ + + i->tag = swf_InsertTag(i->tag,ST_PLACEOBJECT2); + i->cliptags[i->clippos] = i->tag; + i->clipshapes[i->clippos] = myshapeid; + i->clipdepths[i->clippos] = ++i->depth; + i->clippos++; +} + +void swf_endclip(gfxdevice_t*dev) +{ + swfoutput_internal*i = (swfoutput_internal*)dev->internal; + swfoutput*obj = i->obj; + if(i->textid>=0) + endtext(obj); + if(i->shapeid>=0) + endshape(obj); + + if(!i->clippos) { + msg(" Invalid end of clipping region"); + return; + } + i->clippos--; + /*swf_ObjectPlaceClip(i->cliptags[i->clippos],i->clipshapes[i->clippos],i->clipdepths[i->clippos],&i->page_matrix,NULL,NULL, + / * clip to depth: * / i->depth <= i->clipdepths[i->clippos]? i->depth : i->depth - 1); + i->depth ++;*/ + swf_ObjectPlaceClip(i->cliptags[i->clippos],i->clipshapes[i->clippos],i->clipdepths[i->clippos],&i->page_matrix,NULL,NULL,i->depth); +} +int swf_setparameter(gfxdevice_t*dev, const char*key, const char*value) +{ + if(!strcmp(key, "next_bitmap_is_jpeg")) { + ((swfoutput_internal*)dev->internal)->jpeg = 1; + return 1; + } + return 0; +} + +int gfxline_type(gfxline_t*line) +{ + int tmplines=0; + int tmpsplines=0; + int lines=0; + int splines=0; + int haszerosegments=0; + while(line) { + if(line->type == gfx_moveTo) { + tmplines=0; + tmpsplines=0; + } else if(line->type == gfx_lineTo) { + tmplines++; + if(tmplines>lines) + lines=tmplines; + } else if(line->type == gfx_splineTo) { + tmpsplines++; + if(tmpsplines>lines) + splines=tmpsplines; + } + line = line->next; + } + if(lines==0 && splines==0) return 0; + else if(lines==1 && splines==0) return 1; + else if(lines==0 && splines==1) return 2; + else if(splines==0) return 3; + else return 4; +} + +int gfxline_has_dots(gfxline_t*line) +{ + int tmplines=0; + double x,y; + double dist = 0; + int isline = 0; + while(line) { + if(line->type == gfx_moveTo) { + if(isline && dist < 1) { + return 1; + } + dist = 0; + isline = 0; + } else if(line->type == gfx_lineTo) { + dist += fabs(line->x - x) + fabs(line->y - y); + isline = 1; + } else if(line->type == gfx_splineTo) { + dist += fabs(line->sx - x) + fabs(line->sy - y) + + fabs(line->x - line->sx) + fabs(line->y - line->sy); + isline = 1; + } + x = line->x; + y = line->y; + line = line->next; + } + if(isline && dist < 1) { + return 1; + } + return 0; +} + +int gfxline_fix_short_edges(gfxline_t*line) +{ + double x,y; + while(line) { + if(line->type == gfx_lineTo) { + if(fabs(line->x - x) + fabs(line->y - y) < 0.01) { + line->x += 0.01; + } + } else if(line->type == gfx_splineTo) { + if(fabs(line->sx - x) + fabs(line->sy - y) + + fabs(line->x - line->sx) + fabs(line->y - line->sy) < 0.01) { + line->x += 0.01; + } + } + x = line->x; + y = line->y; + line = line->next; + } + return 0; +} + +int shapenr = 0; + +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; + swfoutput*obj = i->obj; + int type = gfxline_type(line); + int has_dots = gfxline_has_dots(line); + + /* TODO: * split line into segments, and perform this check for all segments */ + if(!has_dots && + (width <= config_caplinewidth + || (cap_style == gfx_capRound && joint_style == gfx_joinRound) + || (cap_style == gfx_capRound && type<=2))) { + msg(" draw as stroke, type=%d dots=%d", type, has_dots); + endtext(obj); + swfoutput_setstrokecolor(obj, color->r, color->g, color->b, color->a); + swfoutput_setlinewidth(obj, width); + startshape(obj); + stopFill(obj); + drawgfxline(obj, line); + } else { + msg(" draw as polygon, type=%d dots=%d", type, has_dots); + if(has_dots) + gfxline_fix_short_edges(line); + /* we need to convert the line into a polygon */ + ArtSVP* svp = gfxstrokeToSVP(line, width, cap_style, joint_style, miterLimit); + gfxline_t*gfxline = SVPtogfxline(svp); + dev->fill(dev, gfxline, color); + } +} +void swf_fill(gfxdevice_t*dev, gfxline_t*line, gfxcolor_t*color) +{ + swfoutput_internal*i = (swfoutput_internal*)dev->internal; + swfoutput*obj = i->obj; + endtext(obj); + if(!config_ignoredraworder) + endshape(obj); + swfoutput_setfillcolor(obj, color->r, color->g, color->b, color->a); + startshape(obj); + startFill(obj); + i->fill=1; + drawgfxline(obj, line); + msg(" end of swf_fill (shapeid=%d)", i->shapeid); +} +void swf_fillgradient(gfxdevice_t*dev, gfxgradient_t*gradient, gfxgradienttype_t type, gfxmatrix_t*matrix) +{ + msg(" Gradient filling not implemented yet"); +}