X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=pdf2swf%2Fswfoutput.cc;h=f0d43e764fdb7fd7e7c6e4e96c8ce60dfba1915f;hb=5ede6209244433ea174111a9079fa6d0cf84d227;hp=74c982dc1b1fd81bc939137e8d8361c92bbd4da2;hpb=0e916263b32f4920c2f5581caa77985bf1992081;p=swftools.git diff --git a/pdf2swf/swfoutput.cc b/pdf2swf/swfoutput.cc index 74c982d..f0d43e7 100644 --- a/pdf2swf/swfoutput.cc +++ b/pdf2swf/swfoutput.cc @@ -18,9 +18,20 @@ along with swftools; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +#include +#include #include +#include "../config.h" #include #include +#ifdef HAVE_ASSERT_H +#include +#else +#define assert(a) +#endif +#define logf logarithmf // logf is also used by ../lib/log.h +#include +#undef logf #include "swfoutput.h" #include "spline.h" extern "C" { @@ -35,6 +46,11 @@ int ignoredraworder=0; int drawonlyshapes=0; int jpegquality=85; int storeallcharacters=0; +int enablezlib=0; +int insertstoptag=0; +int flashversion=4; +int splinemaxerror=1; +int fontsplinemaxerror=1; static int flag_protected = 0; typedef unsigned char u8; @@ -71,13 +87,15 @@ int clippos = 0; int CHARMIDX = 0; int CHARMIDY = 0; -void startshape(struct swfoutput* obj); -void starttext(struct swfoutput* obj); -void endshape(); -void endtext(); +char fillstylechanged = 0; + +static void startshape(struct swfoutput* obj); +static void starttext(struct swfoutput* obj); +static void endshape(); +static void endtext(); // matrix multiplication. changes p0 -void transform (plotxy*p0,struct swfmatrix*m) +static void transform (plotxy*p0,struct swfmatrix*m) { double x,y; x = m->m11*p0->x+m->m12*p0->y; @@ -87,19 +105,22 @@ void transform (plotxy*p0,struct swfmatrix*m) } // write a move-to command into the swf -void moveto(TAG*tag, plotxy p0) +static int moveto(TAG*tag, plotxy p0) { int rx = (int)(p0.x*20); int ry = (int)(p0.y*20); - if(rx!=swflastx || ry!=swflasty) { + if(rx!=swflastx || ry!=swflasty || fillstylechanged) { swf_ShapeSetMove (tag, shape, rx,ry); + fillstylechanged = 0; + swflastx=rx; + swflasty=ry; + return 1; } - swflastx=rx; - swflasty=ry; + return 0; } // write a line-to command into the swf -void lineto(TAG*tag, plotxy p0) +static void lineto(TAG*tag, plotxy p0) { int rx = ((int)(p0.x*20)-swflastx); int ry = ((int)(p0.y*20)-swflasty); @@ -111,7 +132,7 @@ void lineto(TAG*tag, plotxy p0) } // write a spline-to command into the swf -void splineto(TAG*tag, plotxy control,plotxy end) +static void splineto(TAG*tag, plotxy control,plotxy end) { int cx = ((int)(control.x*20)-swflastx); int cy = ((int)(control.y*20)-swflasty); @@ -121,12 +142,13 @@ void splineto(TAG*tag, plotxy control,plotxy end) int ey = ((int)(end.y*20)-swflasty); swflastx += ex; swflasty += ey; - swf_ShapeSetCurve(tag, shape, cx,cy,ex,ey); + if(cx || cy || ex || ey) + swf_ShapeSetCurve(tag, shape, cx,cy,ex,ey); } /* write a line, given two points and the transformation matrix. */ -void line(TAG*tag, plotxy p0, plotxy p1, struct swfmatrix*m) +static void line(TAG*tag, plotxy p0, plotxy p1, struct swfmatrix*m) { transform(&p0,m); transform(&p1,m); @@ -136,27 +158,64 @@ void line(TAG*tag, plotxy p0, plotxy p1, struct swfmatrix*m) /* write a cubic (!) spline. This involves calling the approximate() function out of spline.cc to convert it to a quadratic spline. */ -void spline(TAG*tag,plotxy p0,plotxy p1,plotxy p2,plotxy p3,struct swfmatrix*m) +static void spline(TAG*tag,plotxy p0,plotxy p1,plotxy p2,plotxy p3,struct swfmatrix*m) { double d; - struct qspline q[16]; + struct qspline q[128]; int num; int t; transform(&p0,m); transform(&p1,m); transform(&p2,m); transform(&p3,m); - - num = approximate(p0,p1,p2,p3,q); + cspline c; + c.start = p3; + c.control1 = p2; + c.control2 = p1; + c.end = p0; + + if(storefont) { + /* fonts use a different approximation than shapes */ + num = cspline_approximate(&c, q, fontsplinemaxerror/20.0, APPROXIMATE_RECURSIVE_BINARY); + //num = cspline_approximate(&c, q, 10.0, APPROXIMATE_INFLECTION); + } else { + num = cspline_approximate(&c, q, splinemaxerror/20.0, APPROXIMATE_RECURSIVE_BINARY); + } for(t=0;tid != ST_DEFINEFONT && tag->id != ST_DEFINESHAPE && @@ -166,8 +225,6 @@ void drawpath(TAG*tag, T1_OUTLINE*outline, struct swfmatrix*m) logf(" internal error: drawpath needs a shape tag, not %d\n",tag->id); exit(1); } - int log = 0; - double x=0,y=0; double lastx=0,lasty=0; double firstx=0,firsty=0; @@ -226,7 +283,7 @@ void drawpath(TAG*tag, T1_OUTLINE*outline, struct swfmatrix*m) spline(tag,p0,p1,p2,p3,m); } else { - logf(" drawpath: unknown outline type:%d\n", outline->type); + logf(" drawpath: unknown outline type:%d\n", outline->type); } lastx=x; lasty=y; @@ -247,7 +304,411 @@ void drawpath(TAG*tag, T1_OUTLINE*outline, struct swfmatrix*m) } } -int colorcompare(RGBA*a,RGBA*b) +plotxy getPivot(T1_OUTLINE*outline, int dir, double line_width, int end, int trytwo) +{ + T1_PATHPOINT next, next2; + double xv=0,yv=0, xv2=0, yv2=0; + plotxy p; + int two = 0; + + if(!end) { + if(outline->type == T1_PATHTYPE_LINE) { + next = outline->dest; + } else { + next = ((T1_BEZIERSEGMENT*)outline)->B; + if(next.x==0 && next.y==0) { + next = ((T1_BEZIERSEGMENT*)outline)->C; + } + if(next.x==0 && next.y==0) { + next = ((T1_BEZIERSEGMENT*)outline)->dest; + } + } + next2 = next; + if(trytwo && outline->last && outline->last->type != T1_PATHTYPE_MOVE) { + if(outline->type == T1_PATHTYPE_LINE) { + next2 = outline->last->dest; + } else { + T1_PATHPOINT c = ((T1_BEZIERSEGMENT*)(outline->last))->C; + T1_PATHPOINT b = ((T1_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 == T1_PATHTYPE_LINE) { + next = outline->dest; + } else { + T1_PATHPOINT c = ((T1_BEZIERSEGMENT*)outline)->C; + T1_PATHPOINT b = ((T1_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 != T1_PATHTYPE_MOVE) { + if(outline->type == T1_PATHTYPE_LINE) { + next2 = outline->link->dest; + } else { + next2 = ((T1_BEZIERSEGMENT*)(outline->link))->B; + if(next2.x==0 && next2.y==0) { + next2 = ((T1_BEZIERSEGMENT*)outline->link)->C; + } + if(next2.x==0 && next2.y==0) { + next2 = ((T1_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*output, double x, double y, struct swfmatrix* m, T1_OUTLINE*outline) +{ + double lastx=x, lasty=y; + while (outline && outline->type != T1_PATHTYPE_MOVE) + { + x += (outline->dest.x/(float)0xffff); + y += (outline->dest.y/(float)0xffff); + + if(outline->type == T1_PATHTYPE_LINE) + { + plotxy p0, p1; + p0.x=lastx; + p0.y=lasty; + p1.x= x; + p1.y= y; + line(tag, p0, p1, m); + } + else if(outline->type == T1_PATHTYPE_BEZIER) + { + plotxy p0,p1,p2,p3; + T1_BEZIERSEGMENT*o2 = (T1_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(tag,p0,p1,p2,p3,m); + } + lastx=x; + lasty=y; + outline = outline->link; + } +} + +void drawShortPathWithEnds(struct swfoutput*output, double x, double y, struct swfmatrix* m, T1_OUTLINE*outline, int num, int line_cap, int line_join, double line_width) +{ + plotxy d,d2; + int back = 0; + + if(line_cap == LINE_CAP_BUTT || line_cap == LINE_CAP_SQUARE) { + endshape(); + startshape(output); + T1_OUTLINE *last, *tmp=outline; + plotxy s,e,p0,p1,p2,p3,m0,m1,m2,m3; + double x2 = x; + double y2 = y; + double lx=x,ly=y; + double ee = 1.0; + int nr; + while(tmp && tmp->type != T1_PATHTYPE_MOVE) { + last = tmp; + lx += (tmp->dest.x/(float)0xffff); + ly += (tmp->dest.y/(float)0xffff); + tmp = tmp->link; + } + s = getPivot(outline, 0, line_width, 0, 0); + e = getPivot(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(); + if(line_cap == LINE_CAP_BUTT) { + if(dir) { + q0.x = 0; q0.y = 0; + q1.x = sizex; q1.y = 0; + q2.x = sizex; q2.y = sizey; + q3.x = 0; q3.y = sizey; + } else { + q0.x = sizex; q0.y = sizey; + q1.x = 0; q1.y = sizey; + q2.x = 0; q2.y = 0; + q3.x = sizex; q3.y = 0; + } + q4.x = p0.x; + q4.y = p0.y; + moveto(tag, q0); + lineto(tag, q1); + lineto(tag, q2); + lineto(tag, q3); + lineto(tag, q0); + + transform(&q4,m); + lineto(tag, q4); + } + + line(tag, p0, p1, m); + line(tag, p1, p2, m); + line(tag, p2, p3, m); + line(tag, p3, p0, m); + + if(line_cap == LINE_CAP_BUTT) { + lineto(tag, q0); + swf_ShapeSetEnd(tag); + tag = swf_InsertTag(tag, ST_PLACEOBJECT2); + swf_ObjectPlaceClip(tag,shapeid,depth,NULL,NULL,NULL,depth+2-nr); + depth++; + shapeid = -1; + startshape(output); + } + p0 = m0; + p1 = m1; + p2 = m2; + p3 = m3; + } + + stopFill(); + } + + drawShortPath(output,x,y,m,outline); + + if(line_cap == LINE_CAP_BUTT) { + endshape(); + startshape(output); + } +} + +void drawT1toRect(struct swfoutput*output, double x, double y, struct swfmatrix* m, T1_OUTLINE*outline, int num, int line_cap, int line_join, double line_width) +{ + plotxy d1,d2,p1,p2,p3,p4; + + d1.x = (outline->dest.x/(float)0xffff); + d1.y = (outline->dest.y/(float)0xffff); + d2 = getPivot(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(tag, p1,p2, m); + line(tag, p2,p3, m); + line(tag, p3,p4, m); + line(tag, p4,p1, m); +} + +void drawShortPathWithStraightEnds(struct swfoutput*output, double x, double y, struct swfmatrix* m, T1_OUTLINE*outline, int num, int line_cap, int line_join, double line_width) +{ + T1_OUTLINE*tmp=outline; + double xx=x,yy=y; + int stop=0; + assert(shapeid>=0); + + startFill(); + drawT1toRect(output, x, y, m,outline, num, line_cap, line_join, line_width); + + while(tmp->link && tmp->link->type!=T1_PATHTYPE_MOVE) { + xx += (tmp->dest.x/(float)0xffff); + yy += (tmp->dest.y/(float)0xffff); + tmp = tmp->link; + } + + assert(tmp->type == T1_PATHTYPE_LINE); + assert(outline->type == T1_PATHTYPE_LINE); + + 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();startshape(output); + startFill(); + } + + drawT1toRect(output, xx, yy, m, tmp, num, line_cap, line_join, line_width); + + if(outline->link != tmp) + { + stopFill();stop=1; + int save= tmp->type; + tmp->type = T1_PATHTYPE_MOVE; + x += (outline->dest.x/(float)0xffff); + y += (outline->dest.y/(float)0xffff); + outline = outline->link; + drawShortPath(output, x, y, m, outline); + tmp->type = save; + } + } + if(!stop) + stopFill(); +} + +static int t1len(T1_OUTLINE*line) +{ + int num=0; + while(line && line->type != T1_PATHTYPE_MOVE) { + num++; + line = line->link; + } + return num; +} + +static float t1linelen(T1_OUTLINE*line) +{ + 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 *output, T1_OUTLINE*outline, struct swfmatrix*m, int log, int line_join, int line_cap, double line_width, double miter_limit) +{ + if(tag->id != ST_DEFINEFONT && + tag->id != ST_DEFINESHAPE && + tag->id != ST_DEFINESHAPE2 && + tag->id != ST_DEFINESHAPE3) { + logf(" internal error: drawpath needs a shape tag, not %d\n",tag->id); + exit(1); + } + assert(shapeid>=0); + double x=0,y=0; + double lastx=0,lasty=0; + int valid = 0; + int lastwasline = 0; + T1_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 == T1_PATHTYPE_MOVE) { + if(valid && last) { + if(last->type == T1_PATHTYPE_LINE && t1linelen(last)>line_width*2 && + lastwasline && line_cap != LINE_CAP_ROUND) + drawShortPathWithStraightEnds(output, lastx, lasty, m, last, valid, line_cap, line_join, line_width); + else + drawShortPathWithEnds(output, 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 == T1_PATHTYPE_LINE && t1linelen(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(RGBA*a,RGBA*b) { if(a->r!=b->r || @@ -270,7 +731,7 @@ struct chardata { } chardata[CHARDATAMAX]; int chardatapos = 0; -void putcharacters(TAG*tag) +static void putcharacters(TAG*tag) { int t; SWFFONT font; @@ -402,7 +863,7 @@ void putcharacters(TAG*tag) chardatapos = 0; } -void putcharacter(struct swfoutput*obj, int fontid, int charid, +static void putcharacter(struct swfoutput*obj, int fontid, int charid, int x,int y, int size) { if(chardatapos == CHARDATAMAX) @@ -421,7 +882,7 @@ void putcharacter(struct swfoutput*obj, int fontid, int charid, /* process a character. */ -void drawchar(struct swfoutput*obj, SWFFont*font, char*character, int charnr, swfmatrix*m) +static void drawchar(struct swfoutput*obj, SWFFont*font, char*character, int charnr, swfmatrix*m) { int usefonts=1; if(m->m12!=0 || m->m21!=0) @@ -441,12 +902,12 @@ void drawchar(struct swfoutput*obj, SWFFont*font, char*character, int charnr, sw } else { - T1_OUTLINE*outline = font->getOutline(character); + T1_OUTLINE*outline = font->getOutline(character, charnr); char* charname = character; if(!outline) { logf(" Didn't find %s in current charset (%s)", - character,font->getName()); + FIXNULL(character),FIXNULL(font->getName())); return; } @@ -461,13 +922,11 @@ void drawchar(struct swfoutput*obj, SWFFont*font, char*character, int charnr, sw if(shapeid<0) startshape(obj); - if(!lastwasfill) - swf_ShapeSetStyle(tag,shape,0x8000,fillstyleid,0); - lastwasfill = 1; + startFill(); int lf = fill; fill = 1; - drawpath(tag, outline, &m2); + drawpath(tag, outline, &m2, 0); fill = lf; } } @@ -478,21 +937,36 @@ void swfoutput_drawpath(swfoutput*output, T1_OUTLINE*outline, { if(textid>=0) endtext(); + + /* Multiple polygons in one shape don't overlap correctly, + so we better start a new shape here if the polygon is filled + */ + if(shapeid>=0 && fill && !ignoredraworder) { + endshape(); + } + if(shapeid<0) startshape(output); - if(lastwasfill && !fill) - { - swf_ShapeSetStyle(tag,shape,linestyleid,0x8000,0); - lastwasfill = 0; - } - if(!lastwasfill && fill) - { - swf_ShapeSetStyle(tag,shape,0x8000,fillstyleid,0); - lastwasfill = 1; - } + if(!fill) + stopFill(); + else + startFill(); + + drawpath(tag, outline,m, 0); +} + +void swfoutput_drawpath2poly(struct swfoutput*output, T1_OUTLINE*outline, struct swfmatrix*m, int line_join, int line_cap, double line_width, double miter_limit) +{ + if(textid>=0) + endtext(); + if(shapeid>=0) + endshape(); + assert(shapeid<0); + startshape(output); + stopFill(); - drawpath(tag, outline,m); + drawpath2poly(output, outline, m, 0, line_join, line_cap, line_width, miter_limit); } /* SWFFont: copy all t1 font outlines to a local @@ -517,7 +991,7 @@ SWFFont::SWFFont(char*name, int id, char*filename) if(!charnum) return; - logf(" Font %s(%d): Storing %d outlines.\n", name, id, charnum); + logf(" Font %s(%d): Storing %d outlines.\n", FIXNULL(name), id, charnum); this->standardtablesize = 256; if(this->charnum < this->standardtablesize) @@ -603,10 +1077,10 @@ SWFFont::~SWFFont() if(usednum && !drawonlyshapes) { - logf(" Font %s has %d used characters",fontid, usednum); + logf(" Font %s has %d used characters",FIXNULL(fontid), usednum); TAG*ftag = swf_InsertTag(swf.firstTag,ST_DEFINEFONT); swf_SetU16(ftag, this->swfid); - int initpos = swf_GetDataSize(ftag); + int initpos = swf_GetTagLen(ftag); swfmatrix m; m.m11 = m.m22 = 1; m.m21 = m.m12 = 0; @@ -615,23 +1089,26 @@ SWFFont::~SWFFont() for(t=0;tdata[ptr[t]] = swf_GetDataSize(ftag)-initpos; + *(U16*)&ftag->data[ptr[t]] = + SWAP16(swf_GetTagLen(ftag)-initpos); + swflastx=0; swflasty=0; - swf_SetU8(ftag,0x10); //0 fill bits, 0 linestyle bits + swf_SetU8(ftag,0x10); //1 fill bits, 0 linestyle bits SHAPE s; s.bits.fill = 1; s.bits.line = 0; swf_ShapeSetStyle(ftag,&s,0,1,0); + fillstylechanged = 1; int lastfill = fill; fill = 1; storefont = 1; - drawpath(ftag, outline[swfcharid2char[t]],&m); + drawpath(ftag, outline[swfcharid2char[t]],&m, 0); storefont = 0; fill = lastfill; swf_ShapeSetEnd(ftag); @@ -674,21 +1151,29 @@ SWFFont::~SWFFont() free(char2swfcharid); } -T1_OUTLINE*SWFFont::getOutline(char*name) +T1_OUTLINE*SWFFont::getOutline(char*name, int charnr) { int t; for(t=0;tcharnum;t++) { if(!strcmp(this->charname[t],name)) { - if(!used[t]) - { - swfcharid2char[swfcharpos] = t; - char2swfcharid[t] = swfcharpos; - swfcharpos++; - used[t] = 1; - } return outline[t]; } } + + /* if we didn't find the character, maybe + we can find the capitalized version */ + for(t=0;tcharnum;t++) { + if(!strcasecmp(this->charname[t],name)) + return outline[t]; + } + + /* if we didn't find it by name, use the names of the first 256 characters + of the font to try a new name based on charnr */ + if(this->standardtable && charnr>=0 && charnr < this->standardtablesize) { + return getOutline(this->standardtable[charnr], -1); + } + + logf(" Didn't find character '%s' in font '%s'", FIXNULL(name), this->name); return 0; } @@ -706,10 +1191,38 @@ int SWFFont::getSWFCharID(char*name, int charnr) return char2swfcharid[t]; } } + + /* if we didn't find the character, maybe + we can find the capitalized version */ + for(t=0;tcharnum;t++) { + if(!strcasecmp(this->charname[t],name)) { + if(!used[t]) + { + swfcharid2char[swfcharpos] = t; + char2swfcharid[t] = swfcharpos++; + used[t] = 1; + } + return char2swfcharid[t]; + } + } + + /* if we didn't find it by name, use the names of the first 256 (or so) characters + of the font to try a new name based on charnr */ if(this->standardtable && charnr>=0 && charnr < this->standardtablesize) { return getSWFCharID(this->standardtable[charnr], -1); } - logf(" Didn't find character '%s' in font '%s'", name, this->name); + logf(" Didn't find character '%s' in font '%s'", FIXNULL(name), this->name); + return 0; +} + +int SWFFont::getWidth(char*name) +{ + int t; + for(t=0;tcharnum;t++) { + if(!strcmp(this->charname[t],name)) { + return this->width[t]; + } + } return 0; } @@ -745,7 +1258,7 @@ void swfoutput_setfont(struct swfoutput*obj, char*fontid, int t1id, char*filenam } if(t1id<0) { - logf(" internal error: t1id:%d, fontid:%s\n", t1id,fontid); + logf(" internal error: t1id:%d, fontid:%s\n", t1id,FIXNULL(fontid)); } SWFFont*font = new SWFFont(fontid, t1id, filename); @@ -819,7 +1332,7 @@ void swfoutput_init(struct swfoutput* obj, char*_filename, int _sizex, int _size memset(&swf,0x00,sizeof(SWF)); - swf.fileVersion = 4; + swf.fileVersion = flashversion; swf.frameRate = 0x0040; // 1 frame per 4 seconds swf.movieSize.xmax = 20*sizex; swf.movieSize.ymax = 20*sizey; @@ -841,7 +1354,7 @@ void swfoutput_setprotected() //write PROTECT tag flag_protected = 1; } -void startshape(struct swfoutput*obj) +static void startshape(struct swfoutput*obj) { RGBA rgb; SRECT r; @@ -877,7 +1390,7 @@ void startshape(struct swfoutput*obj) lastwasfill = 0; } -void starttext(struct swfoutput*obj) +static void starttext(struct swfoutput*obj) { SRECT r; MATRIX m; @@ -905,7 +1418,7 @@ void starttext(struct swfoutput*obj) swflastx=swflasty=0; } -void endshape() +static void endshape() { if(shapeid<0) return; @@ -915,7 +1428,7 @@ void endshape() shapeid = -1; } -void endtext() +static void endtext() { if(textid<0) return; @@ -926,7 +1439,7 @@ void endtext() textid = -1; } -void endpage(struct swfoutput*obj) +static void endpage(struct swfoutput*obj) { if(shapeid>=0) endshape(); @@ -934,6 +1447,14 @@ void endpage(struct swfoutput*obj) endtext(); while(clippos) swfoutput_endclip(obj); + + if(insertstoptag) { + ActionTAG*atag=0; + atag = action_Stop(atag); + atag = action_End(atag); + tag = swf_InsertTag(tag,ST_DOACTION); + swf_ActionSet(tag,atag); + } tag = swf_InsertTag(tag,ST_SHOWFRAME); } @@ -968,19 +1489,25 @@ void swfoutput_destroy(struct swfoutput* obj) if(!filename) return; if(filename) - fi = open(filename, O_CREAT|O_TRUNC|O_WRONLY, 0777); + fi = open(filename, O_BINARY|O_CREAT|O_TRUNC|O_WRONLY, 0777); else fi = 1; // stdout if(fi<=0) { - logf(" Could not create \"%s\". ", filename); + logf(" Could not create \"%s\". ", FIXNULL(filename)); exit(1); } tag = swf_InsertTag(tag,ST_END); - if FAILED(swf_WriteSWF(fi,&swf)) - logf(" WriteSWF() failed.\n"); + if(enablezlib) { + if FAILED(swf_WriteSWC(fi,&swf)) + logf(" WriteSWC() failed.\n"); + } else { + if FAILED(swf_WriteSWF(fi,&swf)) + logf(" WriteSWF() failed.\n"); + } + if(filename) close(fi); logf(" SWF written\n"); @@ -1007,9 +1534,9 @@ void swfoutput_setfillcolor(swfoutput* obj, u8 r, u8 g, u8 b, u8 a) obj->fillrgb.g == g && obj->fillrgb.b == b && obj->fillrgb.a == a) return; - if(shapeid>=0) endshape(); + obj->fillrgb.r = r; obj->fillrgb.g = g; obj->fillrgb.b = b; @@ -1085,26 +1612,33 @@ void swfoutput_endclip(swfoutput*obj) swf_ObjectPlaceClip(cliptags[clippos],clipshapes[clippos],clipdepths[clippos],NULL,NULL,NULL,depth++); } -void drawlink(struct swfoutput*obj, ActionTAG*, swfcoord*points); +static void drawlink(struct swfoutput*obj, ActionTAG*,ActionTAG*, swfcoord*points, char mouseover); void swfoutput_linktourl(struct swfoutput*obj, char*url, swfcoord*points) { ActionTAG* actions; + if(!strncmp("http://pdf2swf:", url, 15)) { + char*tmp = strdup(url); + int l = strlen(tmp); + if(tmp[l-1] == '/') + tmp[l-1] = 0; + swfoutput_namedlink(obj, tmp+15, points); + free(tmp); + return; + } if(shapeid>=0) endshape(); if(textid>=0) endtext(); - actions = swf_ActionStart(); if(opennewwindow) - action_GetUrl(url, "_parent"); + actions = action_GetUrl(0, url, "_parent"); else - action_GetUrl(url, "_this"); - action_End(); - swf_ActionEnd(); + actions = action_GetUrl(0, url, "_this"); + actions = action_End(actions); - drawlink(obj, actions, points); + drawlink(obj, actions, 0, points,0); } void swfoutput_linktopage(struct swfoutput*obj, int page, swfcoord*points) { @@ -1115,15 +1649,64 @@ void swfoutput_linktopage(struct swfoutput*obj, int page, swfcoord*points) if(textid>=0) endtext(); - actions = swf_ActionStart(); - action_GotoFrame(page); - action_End(); - swf_ActionEnd(); + actions = action_GotoFrame(0, page); + actions = action_End(actions); - drawlink(obj, actions, points); + drawlink(obj, actions, 0, points,0); } -void drawlink(struct swfoutput*obj, ActionTAG*actions, swfcoord*points) +/* Named Links (a.k.a. Acrobatmenu) are used to implement various gadgets + of the viewer objects, like subtitles, index elements etc. +*/ +void swfoutput_namedlink(struct swfoutput*obj, char*name, swfcoord*points) +{ + ActionTAG *actions1,*actions2; + char*tmp = strdup(name); + char mouseover = 1; + + if(shapeid>=0) + endshape(); + if(textid>=0) + endtext(); + + if(!strncmp(tmp, "call:", 5)) + { + char*x = strchr(&tmp[5], ':'); + if(!x) { + actions1 = action_PushInt(0, 0); //number of parameters (0) + actions1 = action_PushString(actions1, &tmp[5]); //function name + actions1 = action_CallFunction(actions1); + } else { + *x = 0; + actions1 = action_PushString(0, x+1); //parameter + actions1 = action_PushInt(actions1, 1); //number of parameters (1) + actions1 = action_PushString(actions1, &tmp[5]); //function name + actions1 = action_CallFunction(actions1); + } + actions2 = action_End(0); + mouseover = 0; + } + else + { + actions1 = action_PushString(0, "/:subtitle"); + actions1 = action_PushString(actions1, name); + actions1 = action_SetVariable(actions1); + actions1 = action_End(actions1); + + actions2 = action_PushString(0, "/:subtitle"); + actions2 = action_PushString(actions2, ""); + actions2 = action_SetVariable(actions2); + actions2 = action_End(actions2); + } + + drawlink(obj, actions1, actions2, points,mouseover); + + swf_ActionFree(actions1); + swf_ActionFree(actions2); + free(tmp); +} + +static void drawlink(struct swfoutput*obj, ActionTAG*actions1, ActionTAG*actions2, swfcoord*points, char mouseover) { RGBA rgb; SRECT r; @@ -1134,6 +1717,8 @@ void drawlink(struct swfoutput*obj, ActionTAG*actions, swfcoord*points) int myshapeid2; double xmin,ymin; double xmax=xmin=points[0].x,ymax=ymin=points[0].y; + double posx = 0; + double posy = 0; int t; int buttonid = ++currentswfid; for(t=1;t<4;t++) @@ -1143,8 +1728,18 @@ void drawlink(struct swfoutput*obj, ActionTAG*actions, swfcoord*points) if(points[t].xymax) ymax=y4; if(x4linewidth,&obj->strokergb); //fsid = ShapeAddSolidFillStyle(shape,&obj->fillrgb); - fsid = swf_ShapeAddBitmapFillStyle(shape,&m,bitid,0); + fsid = swf_ShapeAddBitmapFillStyle(shape,&m,bitid,1); swf_SetU16(tag, myshapeid); r.xmin = (int)(xmin*20); r.ymin = (int)(ymin*20); @@ -1289,22 +1924,51 @@ void drawimage(struct swfoutput*obj, int bitid, int sizex,int sizey, swf_ObjectPlace(tag,myshapeid,/*depth*/depth++,NULL,NULL,NULL); } -int swfoutput_drawimagejpeg(struct swfoutput*obj, char*filename, int sizex,int sizey, +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) { + TAG*oldtag; if(shapeid>=0) endshape(); if(textid>=0) endtext(); int bitid = ++currentswfid; + oldtag = tag; tag = swf_InsertTag(tag,ST_DEFINEBITSJPEG2); swf_SetU16(tag, bitid); - swf_SetJPEGBits(tag, filename, jpegquality); + if(swf_SetJPEGBits(tag, filename, jpegquality)<0) { + swf_DeleteTag(tag); + tag = oldtag; + return -1; + } + + drawimage(obj, bitid, sizex, sizey, x1,y1,x2,y2,x3,y3,x4,y4); + return bitid; +} + +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) +{ + TAG*oldtag; + JPEGBITS*jpeg; + if(shapeid>=0) + endshape(); + if(textid>=0) + endtext(); + + int bitid = ++currentswfid; + oldtag = tag; + tag = swf_InsertTag(tag,ST_DEFINEBITSJPEG2); + swf_SetU16(tag, bitid); + swf_SetJPEGBits2(tag,sizex,sizey,mem,jpegquality); drawimage(obj, bitid, sizex, sizey, x1,y1,x2,y2,x3,y3,x4,y4); return bitid; } @@ -1315,35 +1979,66 @@ int swfoutput_drawimagelossless(struct swfoutput*obj, RGBA*mem, int sizex,int si double x3,double y3, double x4,double y4) { + TAG*oldtag; if(shapeid>=0) endshape(); if(textid>=0) endtext(); int bitid = ++currentswfid; + oldtag = tag; tag = swf_InsertTag(tag,ST_DEFINEBITSLOSSLESS); swf_SetU16(tag, bitid); - swf_SetLosslessBits(tag,sizex,sizey,mem, BMF_32BIT); + if(swf_SetLosslessBits(tag,sizex,sizey,mem, BMF_32BIT)<0) { + swf_DeleteTag(tag); + tag = oldtag; + return -1; + } drawimage(obj, bitid, sizex, sizey, x1,y1,x2,y2,x3,y3,x4,y4); return bitid; } -int swfoutput_drawimagelossless256(struct swfoutput*obj, U8*mem, RGBA*pal, int sizex,int sizey, +int swfoutput_drawimagelosslessN(struct swfoutput*obj, U8*mem, RGBA*pal, int sizex,int sizey, double x1,double y1, double x2,double y2, double x3,double y3, - double x4,double y4) + double x4,double y4, int n) { + TAG*oldtag; + U8*mem2 = 0; if(shapeid>=0) endshape(); if(textid>=0) endtext(); + 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;y=0) endshape(); if(textid>=0)