X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=pdf2swf%2Fswfoutput.cc;h=c2a825928e7890a1b561fd90ad28362737ba1875;hb=51c668515519b6b9671540365bb333f7fad7c874;hp=19db1a85c01f3c22bbb2f9a6ea6afa40aa186920;hpb=dd81e2a404b4b0751289ef06c4a2011037f39267;p=swftools.git diff --git a/pdf2swf/swfoutput.cc b/pdf2swf/swfoutput.cc index 19db1a8..c2a8259 100644 --- a/pdf2swf/swfoutput.cc +++ b/pdf2swf/swfoutput.cc @@ -36,7 +36,9 @@ 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 @@ -57,9 +59,10 @@ struct fontlist_t fontlist_t*next; }; +double config_dumpfonts=0; double config_ppmsubpixels=0; double config_jpegsubpixels=0; -int config_opennewwindow=0; +int config_opennewwindow=1; int config_ignoredraworder=0; int config_drawonlyshapes=0; int config_jpegquality=85; @@ -71,7 +74,9 @@ int config_splinemaxerror=1; int config_fontsplinemaxerror=1; int config_filloverlap=0; int config_protect=0; +int config_bboxvars=0; float config_minlinewidth=0.05; +double config_caplinewidth=1; typedef struct _swfoutput_internal { @@ -134,14 +139,27 @@ typedef struct _swfoutput_internal int firstpage; char pagefinished; + char overflow; + /* during the transition to the gfxdevice interface: a device which uses this swfoutput as target */ gfxdevice_t device; } swfoutput_internal; -void swf_fillbitmap(struct _gfxdevice*driver, gfxline_t*line, gfximage_t*img, gfxmatrix_t*move, gfxcxform_t*cxform); -int swf_setparameter(struct _gfxdevice*driver, const char*key, const char*value); +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, gfxline_t*line, gfxgradient_t*gradient, gfxgradienttype_t type, gfxmatrix_t*matrix); +void swf_drawchar(gfxdevice_t*dev, char*fontid, int glyph, gfxcolor_t*color, gfxmatrix_t*matrix); +void swf_addfont(gfxdevice_t*dev, char*fontid, gfxfont_t*font); + +int getCharID(SWFFONT *font, int charnr, char *charname, int u); static swfoutput_internal* init_internal_struct() { @@ -150,8 +168,9 @@ static swfoutput_internal* init_internal_struct() i->storefont = 0; i->currentswfid = 0; - i->depth = 1; - i->startdepth = 1; + i->depth = 0; + i->overflow = 0; + i->startdepth = 0; i->linewidth = 0; i->shapeid = -1; i->textid = -1; @@ -177,13 +196,46 @@ static swfoutput_internal* init_internal_struct() 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; + i->device.addfont = swf_addfont; + i->device.drawchar = swf_drawchar; 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; + i->overflow = 1; + } + return ++i->currentswfid; +} +static U16 getNewDepth(struct swfoutput* obj) +{ + swfoutput_internal*i = (swfoutput_internal*)obj->internal; + if(i->depth == 65535) { + if(!id_error) + msg(" Depth Table overflow"); + id_error=1; + i->overflow = 1; + } + return ++i->depth; +} + 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 @@ -192,8 +244,8 @@ static void transform (plotxy*p0,struct swfmatrix*m) double x,y; x = m->m11*p0->x+m->m12*p0->y; y = m->m21*p0->x+m->m22*p0->y; - p0->x = x + m->m13; - p0->y = y + m->m23; + p0->x = x + m->m31; + p0->y = y + m->m32; } // write a move-to command into the swf @@ -211,7 +263,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; @@ -233,6 +285,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) { @@ -241,12 +319,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; @@ -281,52 +362,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 && @@ -379,14 +428,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); } @@ -402,7 +451,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; @@ -417,26 +466,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); } @@ -455,425 +486,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->max_x; q1.y = 0; - q2.x = i->max_x; q2.y = i->max_y; - q3.x = 0; q3.y = i->max_y; - } else { - /* FIXME: box should be smaller */ - q0.x = i->max_x; q0.y = i->max_y; - q1.x = 0; q1.y = i->max_y; - q2.x = 0; q2.y = 0; - q3.x = i->max_x; 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; - } - } - 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) { - double previousx = x, previousy = y; - 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(fabs(lastx-previousx)<0.001 && fabs(lasty-previousy)<0.001) { - /* endpoints match- the path is closed. - Don't bother to draw endings */ - drawShortPath(obj, lastx, lasty, m, 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; //remember last stroke start (first segment after moveto) - 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; + line(obj, i->tag, p0, p1); } -} +}*/ static inline int colorcompare(struct swfoutput*obj, RGBA*a,RGBA*b) { @@ -1083,8 +698,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) @@ -1097,7 +711,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++; } @@ -1107,8 +721,11 @@ static void putcharacter(struct swfoutput*obj, int fontid, int charid, If we set it to low, however, the char positions will be inaccurate */ #define FONT_INTERNAL_SIZE 4 +static int font_active = 0; +static char* font_active_filename = 0; + /* 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) { @@ -1117,20 +734,36 @@ static int drawchar(struct swfoutput*obj, SWFFONT *swffont, char*character, int } int charid = getCharID(swffont, charnr, character, u); + if(font_active) { + char buf[1024]; + sprintf(buf, "%s.usage", font_active_filename); + FILE*fi = fopen(buf, "ab+"); + if(fi) { + fprintf(fi, "%d %d %d %s\n", charnr, u, charid, character); + fclose(fi); + } else + msg(" Couldn't write to %s", buf); + } if(charid<0) { msg(" Didn't find character '%s' (c=%d,u=%d) in current charset (%s, %d characters)", FIXNULL(character),charnr, u, FIXNULL((char*)swffont->name), swffont->numchars); return 0; } + /*if(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); - float x = m->m13; - float y = m->m23; + float x = m->m31; + float y = m->m32; float det = ((m->m11*m->m22)-(m->m21*m->m12)); if(fabs(det) < 0.0005) { /* x direction equals y direction- the text is invisible */ @@ -1142,7 +775,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; @@ -1195,59 +829,18 @@ static void endtext(swfoutput*obj) swf_GetMatrix(0, &m); /* set unit matrix- the real matrix is in the placeobject */ swf_SetMatrix(i->tag,&m); + msg(" Placing text (%d characters) as ID %d", i->chardatapos, i->textid); + putcharacters(obj, i->tag); swf_SetU8(i->tag,0); i->tag = swf_InsertTag(i->tag,ST_PLACEOBJECT2); - //swf_ObjectPlace(i->tag,i->textid,/*depth*/i->depth++,&i->page_matrix,NULL,NULL); 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,getNewDepth(obj),&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; @@ -1294,11 +887,11 @@ int getCharID(SWFFONT *font, int charnr, char *charname, int u) return -1; } - /* set's the t1 font index of the font to use for swfoutput_drawchar(). */ void swfoutput_setfont(struct swfoutput*obj, char*fontid, char*filename) { swfoutput_internal*i = (swfoutput_internal*)obj->internal; + font_active = 0; fontlist_t*last=0,*iterator; if(!fontid) { msg(" No fontid"); @@ -1330,6 +923,11 @@ void swfoutput_setfont(struct swfoutput*obj, char*fontid, char*filename) swf_SetLoadFontParameters(64,/*skip unused*/0,/*full unicode*/1); SWFFONT*swffont = swf_LoadFont(filename); + if(config_dumpfonts) { + font_active = 1; + font_active_filename = strdup(filename); + } + if(swffont == 0) { msg(" Couldn't load font %s (%s)", fontid, filename); swffont = swf_LoadFont(0); @@ -1355,15 +953,19 @@ void swfoutput_setfont(struct swfoutput*obj, char*fontid, char*filename) swffont->encoding = 255; } } + + if(swffont->encoding != FONT_ENCODING_UNICODE && swffont->encoding != 255) { + msg(" Non-unicode mapping for font %s (%s)", fontid, filename); + } - swf_FontSetID(swffont, ++i->currentswfid); + swf_FontSetID(swffont, getNewID(obj)); if(getScreenLogLevel() >= LOGLEVEL_DEBUG) { // print font information - msg(" Font %s (%s)",swffont->name, filename); + msg(" Font %s (%s)",fontid, filename); msg(" | ID: %d", swffont->id); msg(" | Version: %d", swffont->version); - msg(" | Name: %s", fontid); + msg(" | Name: %s", swffont->name); msg(" | Numchars: %d", swffont->numchars); msg(" | Maxascii: %d", swffont->maxascii); msg(" | Style: %d", swffont->style); @@ -1413,9 +1015,13 @@ int swfoutput_queryfont(struct swfoutput*obj, char*fontid) /* set's the matrix which is to be applied to characters drawn by swfoutput_drawchar() */ -void swfoutput_setfontmatrix(struct swfoutput*obj,double m11,double m12, - double m21,double m22) +void swfoutput_setfontmatrix(struct swfoutput*obj,double m11,double m21, + double m12,double m22) { + m11 *= 1024; + m12 *= 1024; + m21 *= 1024; + m22 *= 1024; swfoutput_internal*i = (swfoutput_internal*)obj->internal; if(obj->fontm11 == m11 && obj->fontm12 == m12 && @@ -1438,7 +1044,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; @@ -1446,16 +1052,16 @@ int swfoutput_drawchar(struct swfoutput* obj,double x,double y,char*character, i m.m12 = obj->fontm12; m.m21 = obj->fontm21; m.m22 = obj->fontm22; - m.m13 = x; - m.m23 = y; - return drawchar(obj, obj->swffont, character, charnr, u, &m); + m.m31 = x; + m.m32 = y; + 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) @@ -1480,7 +1086,7 @@ void swfoutput_pagefeed(struct swfoutput*obj) i->tag = swf_InsertTag(i->tag,ST_SHOWFRAME); i->frameno ++; - for(i->depth--;i->depth>=i->startdepth;i->depth--) { + for(i->depth;i->depth>i->startdepth;i->depth--) { i->tag = swf_InsertTag(i->tag,ST_REMOVEOBJECT2); swf_SetU16(i->tag,i->depth); } @@ -1495,7 +1101,7 @@ static void setBackground(struct swfoutput*obj, int x1, int y1, int x2, int y2) SRECT r; SHAPE* s; int ls1=0,fs1=0; - int shapeid = ++i->currentswfid; + int shapeid = getNewID(obj); r.xmin = x1; r.ymin = y1; r.xmax = x2; @@ -1514,9 +1120,9 @@ static void setBackground(struct swfoutput*obj, int x1, int y1, int x2, int 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); + swf_ObjectPlace(i->tag,shapeid,getNewDepth(obj),0,0,0); i->tag = swf_InsertTag(i->tag, ST_PLACEOBJECT2); - swf_ObjectPlaceClip(i->tag,shapeid,i->depth++,0,0,0,65535); + swf_ObjectPlaceClip(i->tag,shapeid,getNewDepth(obj),0,0,0,65535); i->cliptag = i->tag; } @@ -1533,7 +1139,7 @@ void swfoutput_newpage(struct swfoutput*obj, int pageNum, int movex, int movey, if(i->cliptag && i->frameno == i->lastframeno) { SWFPLACEOBJECT obj; swf_GetPlaceObject(i->cliptag, &obj); - obj.clipdepth = i->depth++; + obj.clipdepth = i->depth; swf_ResetTag(i->cliptag, i->cliptag->id); swf_SetPlaceObject(i->cliptag, &obj); swf_PlaceObjectFree(&obj); @@ -1580,7 +1186,6 @@ void swfoutput_init(struct swfoutput* obj) msg(" initializing swf output for size %d*%d\n", i->max_x,i->max_y); obj->swffont = 0; - obj->drawmode = -1; memset(&i->swf,0x00,sizeof(SWF)); @@ -1596,7 +1201,7 @@ void swfoutput_init(struct swfoutput* obj) rgb.a = rgb.r = rgb.g = rgb.b = 0xff; swf_SetRGB(i->tag,&rgb); - i->startdepth = i->depth = 3; /* leave room for clip and background rectangle */ + i->startdepth = i->depth = 0; if(config_protect) i->tag = swf_InsertTag(i->tag, ST_PROTECT); @@ -1607,6 +1212,9 @@ static void startshape(struct swfoutput*obj) swfoutput_internal*i = (swfoutput_internal*)obj->internal; SRECT r; + if(i->shapeid>=0) + return; + if(i->textid>=0) endtext(obj); @@ -1616,7 +1224,10 @@ static void startshape(struct swfoutput*obj) i->linestyleid = swf_ShapeAddLineStyle(i->shape,i->linewidth,&obj->strokergb); 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; @@ -1644,9 +1255,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; } @@ -1738,16 +1349,16 @@ 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?*/ @@ -1755,6 +1366,12 @@ static void endshape(swfoutput*obj, int clipdepth) 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; } @@ -1763,19 +1380,50 @@ 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,getNewDepth(obj),&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); + }*/ +} + +void wipeSWF(SWF*swf) +{ + TAG*tag = swf->firstTag; + while(tag) { + TAG*next = tag->next; + if(tag->id != ST_SETBACKGROUNDCOLOR && + tag->id != ST_END && + tag->id != ST_DOACTION && + tag->id != ST_SHOWFRAME) { + swf_DeleteTag(tag); + } + tag = next; + } } + void swfoutput_finalize(struct swfoutput*obj) { swfoutput_internal*i = (swfoutput_internal*)obj->internal; @@ -1783,6 +1431,32 @@ void swfoutput_finalize(struct swfoutput*obj) if(i->tag && i->tag->id == ST_END) return; //already done + if(config_bboxvars) { + TAG* tag = swf_InsertTag(i->swf.firstTag, ST_DOACTION); + ActionTAG*a = 0; + a = action_PushString(a, "xmin"); + a = action_PushFloat(a, i->swf.movieSize.xmin / 20.0); + a = action_SetVariable(a); + a = action_PushString(a, "ymin"); + a = action_PushFloat(a, i->swf.movieSize.ymin / 20.0); + a = action_SetVariable(a); + a = action_PushString(a, "xmax"); + a = action_PushFloat(a, i->swf.movieSize.xmax / 20.0); + a = action_SetVariable(a); + a = action_PushString(a, "ymax"); + a = action_PushFloat(a, i->swf.movieSize.ymax / 20.0); + a = action_SetVariable(a); + a = action_PushString(a, "width"); + a = action_PushFloat(a, (i->swf.movieSize.xmax - i->swf.movieSize.xmin) / 20.0); + a = action_SetVariable(a); + a = action_PushString(a, "height"); + a = action_PushFloat(a, (i->swf.movieSize.ymax - i->swf.movieSize.ymin) / 20.0); + a = action_SetVariable(a); + a = action_End(a); + swf_ActionSet(tag, a); + swf_ActionFree(a); + } + if(i->frameno == i->lastframeno) // fix: add missing pagefeed swfoutput_pagefeed(obj); @@ -1792,8 +1466,8 @@ void swfoutput_finalize(struct swfoutput*obj) TAG*mtag = i->swf.firstTag; if(iterator->swffont) { mtag = swf_InsertTag(mtag, ST_DEFINEFONT2); - /*if(!storeallcharacters) - swf_FontReduce(iterator->swffont);*/ + if(!config_storeallcharacters) + swf_FontReduce(iterator->swffont); swf_FontSetDefine2(mtag, iterator->swffont); } @@ -1809,6 +1483,10 @@ void swfoutput_finalize(struct swfoutput*obj) swf_DeleteTag(tag); tag = prev; } + + if(i->overflow) { + wipeSWF(&i->swf); + } } SWF* swfoutput_get(struct swfoutput*obj) @@ -1855,7 +1533,6 @@ int swfoutput_save(struct swfoutput* obj, char*filename) if(filename) close(fi); - msg(" SWF written\n"); return 1; } @@ -1883,23 +1560,7 @@ void swfoutput_destroy(struct swfoutput* obj) 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 && @@ -1907,7 +1568,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; @@ -1915,7 +1576,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 && @@ -1924,71 +1585,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) @@ -2006,11 +1621,11 @@ 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); - if(config_opennewwindow) + if(!config_opennewwindow) actions = action_GetUrl(0, url, "_parent"); else actions = action_GetUrl(0, url, "_this"); @@ -2024,7 +1639,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); @@ -2045,7 +1660,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); @@ -2101,7 +1716,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; @@ -2123,7 +1738,7 @@ static void drawlink(struct swfoutput*obj, ActionTAG*actions1, ActionTAG*actions xmax -= posx; ymax -= posy; /* shape */ - myshapeid = ++i->currentswfid; + myshapeid = getNewID(obj); i->tag = swf_InsertTag(i->tag,ST_DEFINESHAPE3); swf_ShapeNew(&i->shape); rgb.r = rgb.b = rgb.a = rgb.g = 0; @@ -2147,7 +1762,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; @@ -2218,10 +1833,9 @@ 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, getNewDepth(obj),&m,0,0); + } else { + swf_ObjectPlace(i->tag, buttonid, getNewDepth(obj),&i->page_matrix,0,0); } } @@ -2267,72 +1881,202 @@ for(t=0;t box.xmax) - box.xmax = x; - if(y < box.ymin) - box.ymin = y; - if(y > box.ymax) - box.ymax = y; - return box; -} - -gfxbbox_t gfxline_getbbox(gfxline_t*line) -{ - gfxcoord_t x=0,y=0; - gfxbbox_t bbox = {0,0,0,0}; - char last = 0; - while(line) { - if(line->type == gfx_moveTo) { - last = 1; - } else if(line->type == gfx_lineTo) { - if(last) bbox = gfxbbox_expand_to_point(bbox, x, y); - bbox = gfxbbox_expand_to_point(bbox, line->x, line->y); - last = 0; - } else if(line->type == gfx_splineTo) { - if(last) bbox = gfxbbox_expand_to_point(bbox, x, y); - bbox = gfxbbox_expand_to_point(bbox, line->sx, line->sy); - bbox = gfxbbox_expand_to_point(bbox, line->x, line->y); - last = 0; - } - x = line->x; - y = line->x; - line = line->next; - } - return bbox; -} -/* ---------- */ - -static void drawgfxline(struct swfoutput*obj, gfxline_t*line) +static void drawgfxline(struct swfoutput*obj, gfxline_t*line) { swfoutput_internal*i = (swfoutput_internal*)obj->internal; - while(line) { + 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; } } + +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; + gfxdevice_t*dev = &i->device; + dev->stroke(dev, line, width, col, cap_style, joint_style, miterLimit); +} +void swfoutput_fillgfxline(struct swfoutput*obj, gfxline_t*line, gfxcolor_t*col) +{ + swfoutput_internal*i = (swfoutput_internal*)obj->internal; + gfxdevice_t*dev = &i->device; + dev->fill(dev, line, col); +} +void swfoutput_startclip(struct swfoutput*obj, gfxline_t*line) +{ + swfoutput_internal*i = (swfoutput_internal*)obj->internal; + 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); +} +void swfoutput_gfxaddfont(struct swfoutput*obj, char*fontid, gfxfont_t*font) +{ + swfoutput_internal*i = (swfoutput_internal*)obj->internal; + gfxdevice_t*dev = &i->device; + dev->addfont(dev, fontid, font); +} +void swfoutput_gfxdrawchar(struct swfoutput*obj, char*fontid, int glyph, gfxcolor_t*c, gfxmatrix_t*m) +{ + swfoutput_internal*i = (swfoutput_internal*)obj->internal; + gfxdevice_t*dev = &i->device; + dev->drawchar(dev, fontid, glyph, c, m); +} + +#define IMAGE_TYPE_JPEG 0 +#define IMAGE_TYPE_LOSSLESS 1 + +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 type) +{ + swfoutput_internal*i = (swfoutput_internal*)obj->internal; + + RGBA*newpic=0; + + double l1 = sqrt((x4-x1)*(x4-x1) + (y4-y1)*(y4-y1)); + double l2 = sqrt((x2-x1)*(x2-x1) + (y2-y1)*(y2-y1)); + + gfxline_t p1,p2,p3,p4,p5; + p1.type=gfx_moveTo;p1.x=x1; p1.y=y1;p1.next=&p2; + p2.type=gfx_lineTo;p2.x=x2; p2.y=y2;p2.next=&p3; + p3.type=gfx_lineTo;p3.x=x3; p3.y=y3;p3.next=&p4; + p4.type=gfx_lineTo;p4.x=x4; p4.y=y4;p4.next=&p5; + p5.type=gfx_lineTo;p5.x=x1; p5.y=y1;p5.next=0; + + {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; + } + + 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; + + 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_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_drawimage(obj,mem,sizex,sizey,x1,y1,x2,y2,x3,y3,x4,y4, IMAGE_TYPE_JPEG); +} + +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, "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); + } else if(!strcmp(name, "filloverlap")) { + config_filloverlap = atoi(value); + } else if(!strcmp(name, "linksopennewwindow")) { + config_opennewwindow = atoi(value); + } else if(!strcmp(name, "opennewwindow")) { + config_opennewwindow = atoi(value); + } else if(!strcmp(name, "storeallcharacters")) { + config_storeallcharacters = atoi(value); + } else if(!strcmp(name, "enablezlib")) { + config_enablezlib = atoi(value); + } else if(!strcmp(name, "bboxvars")) { + config_bboxvars = atoi(value); + } else if(!strcmp(name, "insertstop")) { + config_insertstoptag = atoi(value); + } else if(!strcmp(name, "protected")) { + config_protect = atoi(value); + } else if(!strcmp(name, "flashversion")) { + 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, "dumpfonts")) { + config_dumpfonts = atoi(value); + } else if(!strcmp(name, "jpegquality")) { + int val = atoi(value); + if(val<0) val=0; + if(val>100) val=100; + config_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; + config_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; + config_fontsplinemaxerror = v; + } else { + fprintf(stderr, "unknown parameter: %s (=%s)\n", name, value); + } +} + +// -------------------------------------------------------------------- + static CXFORM gfxcxform_to_cxform(gfxcxform_t* c) { CXFORM cx; @@ -2356,16 +2100,130 @@ static CXFORM gfxcxform_to_cxform(gfxcxform_t* c) 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; + } +} + +/* TODO */ +static int imageInCache(swfoutput*obj, void*data, int width, int height) +{ + return -1; +} +static void addImageToCache(swfoutput*obj, void*data, int width, int height) +{ +} + 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 = ++i->currentswfid; int sizex = img->width; int sizey = img->height; - int num_colors = swf_ImageGetNumberOfPaletteEntries(mem,sizex,sizey,0); - int has_alpha = swf_ImageHasAlpha(mem,sizex,sizey); int is_jpeg = i->jpeg; i->jpeg = 0; @@ -2381,11 +2239,24 @@ static int add_image(swfoutput_internal*i, gfximage_t*img, int targetwidth, int } /// } - *newwidth = newsizex; - *newheight = newsizey; - + if(sizex<=0 || sizey<=0 || newsizex<=0 || newsizey<=0) + return -1; /* TODO: cache images */ + *newwidth = sizex; + *newheight = sizey; + + if(newsizex Scaling %dx%d image to %dx%d", sizex, sizey, newsizex, newsizey); + newpic = swf_ImageScale(mem, sizex, sizey, newsizex, newsizey); + *newwidth = sizex = newsizex; + *newheight = sizey = newsizey; + mem = newpic; + + } + + int num_colors = swf_ImageGetNumberOfPaletteEntries(mem,sizex,sizey,0); + int has_alpha = swf_ImageHasAlpha(mem,sizex,sizey); msg(" Drawing %dx%d %s%simage at size %dx%d (%dx%d), %s%d colors", sizex, sizey, @@ -2396,172 +2267,154 @@ static int add_image(swfoutput_internal*i, gfximage_t*img, int targetwidth, int /*newsizex, newsizey,*/ num_colors>256?">":"", num_colors>256?256:num_colors); - if(newsizex!=sizex || newsizey!=sizey) { - newpic = swf_ImageScale(mem, sizex, sizey, newsizex, newsizey); - sizex = newsizex; - sizey = newsizey; - mem = newpic; + /*RGBA* pal = (RGBA*)rfx_alloc(sizeof(RGBA)*num_colors); + swf_ImageGetNumberOfPaletteEntries(mem,sizex,sizey,pal); + int t; + for(t=0;ttag = swf_InsertTag(i->tag,ST_DEFINEBITSLOSSLESS2); - swf_SetU16(i->tag, bitid); - swf_SetLosslessImage(i->tag,mem,sizex,sizey); - } else { - /*TODO: check what is smaller */ - i->tag = swf_InsertTag(i->tag,ST_DEFINEBITSJPEG3); - swf_SetU16(i->tag, bitid); - swf_SetJPEGBits3(i->tag,sizex,sizey,mem,config_jpegquality); - //swf_SetLosslessImage(i->tag,mem,sizex,sizey); - } + int bitid = -1; + int cacheid = imageInCache(obj, mem, sizex, sizey); + + if(cacheid<=0) { + bitid = getNewID(obj); + i->tag = swf_AddImage(i->tag, bitid, mem, sizex, sizey, config_jpegquality); + addImageToCache(obj, mem, sizex, sizey); } else { - if(num_colors<=256 || sizex<8) { - i->tag = swf_InsertTag(i->tag,ST_DEFINEBITSLOSSLESS); - swf_SetU16(i->tag, bitid); - swf_SetLosslessImage(i->tag,mem,sizex,sizey); - } else { - /*TODO: check what is smaller */ - i->tag = swf_InsertTag(i->tag,ST_DEFINEBITSJPEG2); - swf_SetU16(i->tag, bitid); - swf_SetJPEGBits2(i->tag,sizex,sizey,mem,config_jpegquality); - //swf_SetLosslessImage(i->tag,mem,sizex,sizey); - } + bitid = cacheid; } - + 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; - if(i->shapeid>=0) - endshape(obj,0); - if(i->textid>=0) - endtext(obj); - - gfxbbox_t bbox = gfxline_getbbox(line); + 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.r0 = (int)(65536*20*matrix->m01*fx); - m.r1 = (int)(65536*20*matrix->m10*fy); - m.sy = (int)(65536*20*matrix->m11*fy); + 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 = ++i->currentswfid; + 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); - SRECT r; swf_SetU16(i->tag, myshapeid); - r.xmin = (int)(bbox.xmin*20); - r.ymin = (int)(bbox.ymin*20); - r.xmax = (int)(bbox.xmax*20); - r.ymax = (int)(bbox.ymax*20); + 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,/*x*/0,/*y*/0,/*ls*/0,fsid,0); - i->swflastx = i->swflasty = 0; + 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); + swf_ObjectPlace(i->tag,myshapeid,getNewDepth(obj),&i->page_matrix,&cxform2,NULL); } -#define IMAGE_TYPE_JPEG 0 -#define IMAGE_TYPE_LOSSLESS 1 - -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 type) +void swf_startclip(gfxdevice_t*dev, gfxline_t*line) { - swfoutput_internal*i = (swfoutput_internal*)obj->internal; + swfoutput_internal*i = (swfoutput_internal*)dev->internal; + swfoutput*obj = i->obj; - RGBA*newpic=0; - - double l1 = sqrt((x4-x1)*(x4-x1) + (y4-y1)*(y4-y1)); - double l2 = sqrt((x2-x1)*(x2-x1) + (y2-y1)*(y2-y1)); - - gfxline_t p1,p2,p3,p4,p5; - p1.type=gfx_moveTo;p1.x=x1; p1.y=y1;p1.next=&p2; - p2.type=gfx_lineTo;p2.x=x2; p2.y=y2;p2.next=&p3; - p3.type=gfx_lineTo;p3.x=x3; p3.y=y3;p3.next=&p4; - p4.type=gfx_lineTo;p4.x=x4; p4.y=y4;p4.next=&p5; - p5.type=gfx_lineTo;p5.x=x1; p5.y=y1;p5.next=0; + endtext(obj); + endshape(obj); - {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; - } - - float m00,m10,tx; - float m01,m11,ty; - - gfxmatrix_t m; - m.m00 = (p4.x-p1.x)/sizex; - m.m01 = (p1.x-p2.x)/sizey; - m.m10 = -(p4.y-p1.y)/sizex; - m.m11 = -(p1.y-p2.y)/sizey; - m.tx = p1.x - 0.5; - m.ty = p1.y - 0.5; + if(i->clippos >= 127) + { + msg(" Too many clip levels."); + i->clippos --; + } - gfximage_t img; - img.data = (gfxcolor_t*)data; - img.width = sizex; - img.height = sizey; - - if(type == IMAGE_TYPE_JPEG) - /* TODO: pass image_dpi to device instead */ - i->device.setparameter(&i->device, "next_bitmap_is_jpeg", "1"); + 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); - i->device.fillbitmap(&i->device, &p1, &img, &m, 0); + /* 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] = getNewDepth(obj); + i->clippos++; } -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) +void swf_endclip(gfxdevice_t*dev) { - swfoutput_drawimage(obj,mem,sizex,sizey,x1,y1,x2,y2,x3,y3,x4,y4, IMAGE_TYPE_JPEG); -} + swfoutput_internal*i = (swfoutput_internal*)dev->internal; + swfoutput*obj = i->obj; + if(i->textid>=0) + endtext(obj); + if(i->shapeid>=0) + endshape(obj); -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); + 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")) { @@ -2571,51 +2424,286 @@ int swf_setparameter(gfxdevice_t*dev, const char*key, const char*value) return 0; } -void swfoutput_setparameter(char*name, char*value) +int gfxline_type(gfxline_t*line) { - 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); - } else if(!strcmp(name, "filloverlap")) { - config_filloverlap = atoi(value); - } else if(!strcmp(name, "linksopennewwindow")) { - config_opennewwindow = atoi(value); - } else if(!strcmp(name, "opennewwindow")) { - config_opennewwindow = atoi(value); - } else if(!strcmp(name, "storeallcharacters")) { - config_storeallcharacters = atoi(value); - } else if(!strcmp(name, "enablezlib")) { - config_enablezlib = atoi(value); - } else if(!strcmp(name, "insertstop")) { - config_insertstoptag = atoi(value); - } else if(!strcmp(name, "protected")) { - config_protect = atoi(value); - } else if(!strcmp(name, "flashversion")) { - config_flashversion = atoi(value); - } else if(!strcmp(name, "minlinewidth")) { - config_minlinewidth = atof(value); - } else if(!strcmp(name, "jpegquality")) { - int val = atoi(value); - if(val<0) val=0; - if(val>100) val=100; - config_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; - config_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; - config_fontsplinemaxerror = v; + 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 { - fprintf(stderr, "unknown parameter: %s (=%s)\n", name, value); + 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); + free(gfxline); + art_svp_free(svp); } } +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, gfxline_t*line, gfxgradient_t*gradient, gfxgradienttype_t type, gfxmatrix_t*matrix) +{ + msg(" Gradient filling not implemented yet"); +} + +static SWFFONT* gfxfont_to_swffont(gfxfont_t*font, char* id) +{ + SWFFONT*swffont = (SWFFONT*)rfx_calloc(sizeof(SWFFONT)); + int t; + swffont->id = -1; + swffont->version = 2; + swffont->name = (U8*)strdup(id); + swffont->layout = (SWFLAYOUT*)rfx_calloc(sizeof(SWFLAYOUT)); + swffont->layout->ascent = 0; /* ? */ + swffont->layout->descent = 0; + swffont->layout->leading = 0; + swffont->layout->bounds = (SRECT*)rfx_calloc(sizeof(SRECT)*font->num_glyphs); + swffont->encoding = FONT_ENCODING_UNICODE; + swffont->numchars = font->num_glyphs; + swffont->maxascii = font->max_unicode; + swffont->ascii2glyph = (int*)rfx_calloc(sizeof(int)*swffont->maxascii); + swffont->glyph2ascii = (U16*)rfx_calloc(sizeof(U16)*swffont->numchars); + swffont->glyph = (SWFGLYPH*)rfx_calloc(sizeof(SWFGLYPH)*swffont->numchars); + swffont->glyphnames = (char**)rfx_calloc(sizeof(char*)*swffont->numchars); + for(t=0;tmax_unicode;t++) { + swffont->ascii2glyph[t] = font->unicode2glyph[t]; + } + for(t=0;tnum_glyphs;t++) { + drawer_t draw; + gfxline_t*line; + swffont->glyph2ascii[t] = font->glyphs[t].unicode; + if(font->glyphs[t].name) { + swffont->glyphnames[t] = strdup(font->glyphs[t].name); + } else { + swffont->glyphnames[t] = 0; + } + swffont->glyph[t].advance = (int)(font->glyphs[t].advance * 20); + + swf_Shape01DrawerInit(&draw, 0); + line = font->glyphs[t].line; + while(line) { + FPOINT c,to; + c.x = line->sx; c.y = line->sy; + to.x = line->x; to.y = line->y; + if(line->type == gfx_moveTo) { + draw.moveTo(&draw, &to); + } else if(line->type == gfx_lineTo) { + draw.lineTo(&draw, &to); + } else if(line->type == gfx_splineTo) { + draw.splineTo(&draw, &c, &to); + } + line = line->next; + } + draw.finish(&draw); + swffont->glyph[t].shape = swf_ShapeDrawerToShape(&draw); + draw.dealloc(&draw); + } + return swffont; +} + +void swf_addfont(gfxdevice_t*dev, char*fontid, gfxfont_t*font) +{ + swfoutput_internal*i = (swfoutput_internal*)dev->internal; + + if(i->obj->swffont && i->obj->swffont->name && !strcmp((char*)i->obj->swffont->name,fontid)) + return; // the requested font is the current font + + fontlist_t*last=0,*l = i->fontlist; + while(l) { + last = l; + if(!strcmp((char*)l->swffont->name, fontid)) { + return; // we already know this font + } + l = l->next; + } + l = (fontlist_t*)rfx_calloc(sizeof(fontlist_t)); + l->swffont = gfxfont_to_swffont(font, fontid); + l->next = 0; + if(last) { + last->next = l; + } else { + i->fontlist = l; + } + swf_FontSetID(l->swffont, getNewID(i->obj)); + + if(getScreenLogLevel() >= LOGLEVEL_DEBUG) { + // print font information + msg(" Font %s",fontid); + msg(" | ID: %d", l->swffont->id); + msg(" | Version: %d", l->swffont->version); + msg(" | Name: %s", l->swffont->name); + msg(" | Numchars: %d", l->swffont->numchars); + msg(" | Maxascii: %d", l->swffont->maxascii); + msg(" | Style: %d", l->swffont->style); + msg(" | Encoding: %d", l->swffont->encoding); + for(int iii=0; iiiswffont->numchars;iii++) { + msg(" | Glyph %d) name=%s, unicode=%d size=%d bbox=(%.2f,%.2f,%.2f,%.2f)\n", iii, l->swffont->glyphnames?l->swffont->glyphnames[iii]:"", l->swffont->glyph2ascii[iii], l->swffont->glyph[iii].shape->bitlen, + l->swffont->layout->bounds[iii].xmin/20.0, + l->swffont->layout->bounds[iii].ymin/20.0, + l->swffont->layout->bounds[iii].xmax/20.0, + l->swffont->layout->bounds[iii].ymax/20.0 + ); + int t; + for(t=0;tswffont->maxascii;t++) { + if(l->swffont->ascii2glyph[t] == iii) + msg(" | - maps to %d",t); + } + } + } +} + +static void swf_switchfont(gfxdevice_t*dev, char*fontid) +{ + swfoutput_internal*i = (swfoutput_internal*)dev->internal; + swfoutput*obj = i->obj; + + if(obj->swffont && obj->swffont->name && !strcmp((char*)obj->swffont->name,fontid)) + return; // the requested font is the current font + + fontlist_t*l = i->fontlist; + while(l) { + if(!strcmp((char*)l->swffont->name, fontid)) { + obj->swffont = l->swffont; + return; //done! + } + l = l->next; + } + msg(" Unknown font id: %s", fontid); + return; +} + +void swf_drawchar(gfxdevice_t*dev, char*fontid, int glyph, gfxcolor_t*color, gfxmatrix_t*matrix) +{ + swfoutput_internal*i = (swfoutput_internal*)dev->internal; + swfoutput*obj = i->obj; + + if(!obj->swffont || !obj->swffont->name || strcmp((char*)obj->swffont->name,fontid)) // not equal to current font + { + /* TODO: remove the need for this (enhance getcharacterbbox so that it can cope + with multiple fonts */ + endtext(obj); + swf_switchfont(dev, fontid); // set the current font + } + swfoutput_setfontmatrix(obj, matrix->m00, matrix->m01, matrix->m10, matrix->m11); + + swfmatrix m; + m.m11 = obj->fontm11; + m.m12 = obj->fontm12; + m.m21 = obj->fontm21; + m.m22 = obj->fontm22; + m.m31 = matrix->tx; + m.m32 = matrix->ty; + drawchar(obj, obj->swffont, 0, glyph, -1, &m, color); +}