X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=pdf2swf%2Fswfoutput.cc;h=230c14e39c5c758776fd51b62b99d51c4fa32b73;hb=9a2d4ac87d149536ba395ceda274e6d0e235a11a;hp=be993e4c48acc3d145c1e0f73af582ce6422198b;hpb=68763e3a6163954a9309a5eef58ee4529b81ef99;p=swftools.git diff --git a/pdf2swf/swfoutput.cc b/pdf2swf/swfoutput.cc index be993e4..230c14e 100644 --- a/pdf2swf/swfoutput.cc +++ b/pdf2swf/swfoutput.cc @@ -44,7 +44,7 @@ int jpegquality=85; int storeallcharacters=0; int enablezlib=0; int insertstoptag=0; -int flashversion=4; +int flashversion=5; int splinemaxerror=1; int fontsplinemaxerror=1; @@ -67,7 +67,6 @@ static SHAPE* shape; static int shapeid = -1; static int textid = -1; -static int drawmode = -1; static int fillstyleid; static int linestyleid; static int swflastx=0; @@ -90,7 +89,7 @@ char fillstylechanged = 0; static void startshape(struct swfoutput* obj); static void starttext(struct swfoutput* obj); static void endshape(); -static void endtext(); +static void endtext(struct swfoutput* obj); // matrix multiplication. changes p0 static void transform (plotxy*p0,struct swfmatrix*m) @@ -120,11 +119,17 @@ static int moveto(TAG*tag, plotxy p0) // write a line-to command into the swf static void lineto(TAG*tag, plotxy p0) { - int rx = ((int)(p0.x*20)-swflastx); - int ry = ((int)(p0.y*20)-swflasty); + int px = (int)(p0.x*20); + int py = (int)(p0.y*20); + int rx = (px-swflastx); + int ry = (py-swflasty); /* we can't skip this for rx=0,ry=0, those are plots */ swf_ShapeSetLine (tag, shape, rx,ry); + + //swf_ExpandRect3(boundingBox, px, py, linewidth); + //swf_ExpandRect3(boundingBox, swflastx, swflasty, linewidth); + shapeisempty = 0; swflastx+=rx; swflasty+=ry; @@ -198,27 +203,26 @@ static void stopFill() { if(lastwasfill) { - swf_ShapeSetStyle(tag,shape,linestyleid,0x8000,0); - fillstylechanged = 1; - lastwasfill = 0; + swf_ShapeSetStyle(tag,shape,linestyleid,0x8000,0); + fillstylechanged = 1; + lastwasfill = 0; } } static void startFill() { if(!lastwasfill) { - swf_ShapeSetStyle(tag,shape,0x8000,fillstyleid,0); - fillstylechanged = 1; - lastwasfill = 1; + swf_ShapeSetStyle(tag,shape,0x8000,fillstyleid,0); + fillstylechanged = 1; + lastwasfill = 1; } } /* draw an outline. These are generated by pdf2swf and by t1lib (representing characters). */ -void drawpath(TAG*tag, SWF_OUTLINE*outline, struct swfmatrix*m, int log) +void drawpath(struct swfoutput*output, SWF_OUTLINE*outline, struct swfmatrix*m, int log) { - if(tag->id != ST_DEFINEFONT && - tag->id != ST_DEFINESHAPE && + if( tag->id != ST_DEFINESHAPE && tag->id != ST_DEFINESHAPE2 && tag->id != ST_DEFINESHAPE3) { @@ -236,6 +240,17 @@ void drawpath(TAG*tag, SWF_OUTLINE*outline, struct swfmatrix*m, int log) y += (outline->dest.y/(float)0xffff); if(outline->type == SWF_PATHTYPE_MOVE) { + if(!init && fill && output->drawmode != DRAWMODE_EOFILL && !ignoredraworder) { + /* 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(); + startshape(output); + startFill(); + } + if(((int)(lastx*20) != (int)(firstx*20) || (int)(lasty*20) != (int)(firsty*20)) && fill && !init) @@ -657,8 +672,7 @@ static float t1linelen(SWF_OUTLINE*line) void drawpath2poly(struct swfoutput *output, SWF_OUTLINE*outline, struct swfmatrix*m, int log, int line_join, int line_cap, double line_width, double miter_limit) { - if(tag->id != ST_DEFINEFONT && - tag->id != ST_DEFINESHAPE && + if( tag->id != ST_DEFINESHAPE && tag->id != ST_DEFINESHAPE2 && tag->id != ST_DEFINESHAPE3) { msg(" internal error: drawpath needs a shape tag, not %d\n",tag->id); @@ -731,6 +745,47 @@ struct chardata { } chardata[CHARDATAMAX]; int chardatapos = 0; +static SRECT getcharacterbbox(SWFFONT*font) +{ + SRECT r; + memset(&r, 0, sizeof(r)); + + int t; + printf("\n"); + for(t=0;tlayout->bounds[chardata[t].charid]; + b.xmin *= chardata[t].size; + b.ymin *= chardata[t].size; + b.xmax *= chardata[t].size; + b.ymax *= chardata[t].size; + b.xmin /= 1024; + b.ymin /= 1024; + b.xmax /= 1024; + b.ymax /= 1024; + b.xmin += chardata[t].x; + b.ymin += chardata[t].y; + b.xmax += chardata[t].x; + b.ymax += chardata[t].y; + printf("(%d,%d,%d,%d) -> (%d,%d,%d,%d)\n", + font->layout->bounds[chardata[t].charid].xmin, + font->layout->bounds[chardata[t].charid].ymin, + font->layout->bounds[chardata[t].charid].xmax, + font->layout->bounds[chardata[t].charid].ymax, + b.xmin, + b.ymin, + b.xmax, + b.ymax); + swf_ExpandRect2(&r, &b); + } + printf("-----> (%d,%d,%d,%d)\n", + r.xmin, + r.ymin, + r.xmax, + r.ymax); + return r; +} + static void putcharacters(TAG*tag) { int t; @@ -873,7 +928,7 @@ static void putcharacter(struct swfoutput*obj, int fontid, int charid, if(chardatapos == CHARDATAMAX) { msg(" Character buffer too small. SWF will be slightly bigger"); - endtext(); + endtext(obj); starttext(obj); } chardata[chardatapos].fontid = fontid; @@ -891,50 +946,46 @@ struct fontlist_t fontlist_t*next; } *fontlist = 0; +#define FONT_INTERNAL_SIZE 1 + /* process a character. */ static int drawchar(struct swfoutput*obj, SWFFONT *swffont, char*character, int charnr, int u, swfmatrix*m) { - int usefonts=1; - if(m->m12!=0 || m->m21!=0) - usefonts=0; - if(m->m11 != m->m22) - usefonts=0; - if(!swffont) { msg(" Font is NULL"); return 0; } - if(!usefonts) { - msg(" Non diagonal font matrix: %f %f", m->m11, m->m21); - msg(" | %f %f", m->m12, m->m22); + int charid = getCharID(swffont, charnr, character, u); + + if(charid<0) { + msg(" Didn't find character '%s' (c=%d,u=%d) in current charset (%s, %d characters)", + FIXNULL(character),charnr, u, FIXNULL((char*)swffont->name), swffont->numchars); + return 0; } - //if(usefonts && ! drawonlyshapes) - if (1) - { - int charid = getCharID(swffont, charnr, character, u); - - if(charid<0) { - msg(" Didn't find character '%s' (c=%d,u=%d) in current charset (%s, %d characters)", - FIXNULL(character),charnr, u, FIXNULL((char*)swffont->name), swffont->numchars); - /*fontlist_t*it = fontlist; - while(it) { - msg(" Font history: %s [%d]", it->swffont->name, getCharID(it->swffont, charnr, character, u)); - it = it->next; - }*/ - return 0; - } - - if(shapeid>=0) - endshape(); - if(textid<0) - starttext(obj); + if(shapeid>=0) + endshape(); + if(textid<0) + starttext(obj); - putcharacter(obj, swffont->id, charid,(int)(m->m13*20),(int)(m->m23*20), - (int)(m->m11+0.5)); + float x = m->m13; + float y = m->m23; + float det = ((m->m11*m->m22)-(m->m21*m->m12)); + if(fabs(det) < 0.0005) { + /* x direction equals y direction- the text is invisible */ return 1; } + det = 20*FONT_INTERNAL_SIZE / det; + + SPOINT p; + p.x = (SCOORD)(( x * m->m22 - y * m->m12)*det); + p.y = (SCOORD)((- x * m->m21 + y * m->m11)*det); + + putcharacter(obj, swffont->id, charid,p.x,p.y,FONT_INTERNAL_SIZE); + swf_FontUseGlyph(swffont, charid); + return 1; + /*else { SWF_OUTLINE*outline = font->getOutline(character, charnr); @@ -953,7 +1004,7 @@ static int drawchar(struct swfoutput*obj, SWFFONT *swffont, char*character, int m2.m22/=100; if(textid>=0) - endtext(); + endtext(obj); if(shapeid<0) startshape(obj); @@ -966,12 +1017,37 @@ static int drawchar(struct swfoutput*obj, SWFFONT *swffont, char*character, int }*/ } +static void endtext(swfoutput*obj) +{ + if(textid<0) + return; + + tag = swf_InsertTag(tag,ST_DEFINETEXT); + swf_SetU16(tag, textid); + + SRECT r; + r = getcharacterbbox(obj->swffont); + + swf_SetRect(tag,&r); + + MATRIX m; + swf_GetMatrix(0, &m); + swf_SetMatrix(tag,&m); + + putcharacters(tag); + swf_SetU8(tag,0); + tag = swf_InsertTag(tag,ST_PLACEOBJECT2); + swf_ObjectPlace(tag,textid,/*depth*/depth++,&obj->fontmatrix,NULL,NULL); + textid = -1; +} + + /* draw a curved polygon. */ void swfoutput_drawpath(swfoutput*output, SWF_OUTLINE*outline, struct swfmatrix*m) { if(textid>=0) - endtext(); + endtext(output); /* Multiple polygons in one shape don't overlap correctly, so we better start a new shape here if the polygon is filled @@ -988,13 +1064,13 @@ void swfoutput_drawpath(swfoutput*output, SWF_OUTLINE*outline, else startFill(); - drawpath(tag, outline,m, 0); + drawpath(output, outline,m, 0); } void swfoutput_drawpath2poly(struct swfoutput*output, SWF_OUTLINE*outline, struct swfmatrix*m, int line_join, int line_cap, double line_width, double miter_limit) { if(textid>=0) - endtext(); + endtext(output); if(shapeid>=0) endshape(); assert(shapeid<0); @@ -1023,11 +1099,6 @@ int getCharID(SWFFONT *font, int charnr, char *charname, int u) } if(u>0) { - if(u>=font->maxascii) - msg(" u=%d, font->maxascii=%d",u,font->maxascii); - else - msg(" u=%d, font->maxascii=%d ascci2glyph[%d]=%d",u,font->maxascii,u,font->ascii2glyph[u]); - /* try to use the unicode id */ if(u>=0 && umaxascii && font->ascii2glyph[u]>=0) { return font->ascii2glyph[u]; @@ -1038,6 +1109,13 @@ int getCharID(SWFFONT *font, int charnr, char *charname, int u) return charnr; } + /* the following is technically wrong, and only works if the font encoding + is US-ASCII based. It's needed for fonts which return broken unicode + indices */ +/* if(charnr>=0 && charnrmaxascii && font->ascii2glyph[charnr]>=0) { + return font->ascii2glyph[charnr]; + }*/ + return -1; } @@ -1069,6 +1147,7 @@ void swfoutput_setfont(struct swfoutput*obj, char*fontid, char*filename) return; } + swf_SetLoadFontParameters(0,/*skip unused*/0,/*full unicode*/1); SWFFONT*swffont = swf_LoadFont(filename); if(swffont == 0) { @@ -1089,7 +1168,12 @@ void swfoutput_setfont(struct swfoutput*obj, char*fontid, char*filename) msg(" | Style: %d", swffont->style); msg(" | Encoding: %d", swffont->encoding); for(int iii=0; iiinumchars;iii++) { - msg(" | Glyph %d) name=%s, unicode=%d\n", iii, swffont->glyphnames[iii], swffont->glyph2ascii[iii]); + msg(" | Glyph %d) name=%s, unicode=%d size=%d bbox=(%.2f,%.2f,%.2f,%.2f)\n", iii, swffont->glyphnames[iii], swffont->glyph2ascii[iii], swffont->glyph[iii].shape->bitlen, + swffont->layout->bounds[iii].xmin/20.0, + swffont->layout->bounds[iii].ymin/20.0, + swffont->layout->bounds[iii].xmax/20.0, + swffont->layout->bounds[iii].ymax/20.0 + ); } } @@ -1130,12 +1214,19 @@ void swfoutput_setfontmatrix(struct swfoutput*obj,double m11,double m12, obj->fontm21 == m21 && obj->fontm22 == m22) return; -// if(textid>=0) -// endtext(); + if(textid>=0) + endtext(obj); obj->fontm11 = m11; obj->fontm12 = m12; obj->fontm21 = m21; obj->fontm22 = m22; + + MATRIX m; + m.sx = (U32)(((obj->fontm11)*65536)/FONT_INTERNAL_SIZE); m.r1 = (U32)(((obj->fontm12)*65536)/FONT_INTERNAL_SIZE); + m.r0 = (U32)(((obj->fontm21)*65536)/FONT_INTERNAL_SIZE); m.sy = (U32)(((obj->fontm22)*65536)/FONT_INTERNAL_SIZE); + m.tx = 0; + m.ty = 0; + obj->fontmatrix = m; } /* draws a character at x,y. */ @@ -1164,6 +1255,7 @@ void swfoutput_init(struct swfoutput* obj, char*_filename, int x1, int y1, int x msg(" initializing swf output for size %d*%d\n", sizex,sizey); obj->swffont = 0; + obj->drawmode = -1; memset(&swf,0x00,sizeof(SWF)); @@ -1227,7 +1319,7 @@ static void startshape(struct swfoutput*obj) SRECT r; if(textid>=0) - endtext(); + endtext(obj); tag = swf_InsertTag(tag,ST_DEFINESHAPE); @@ -1241,6 +1333,7 @@ static void startshape(struct swfoutput*obj) shapeid = ++currentswfid; swf_SetU16(tag,shapeid); // ID + /* TODO: patch back */ r.xmin = 0; r.ymin = 0; r.xmax = 20*sizex; @@ -1260,29 +1353,11 @@ static void startshape(struct swfoutput*obj) static void starttext(struct swfoutput*obj) { - SRECT r; - MATRIX m; if(shapeid>=0) endshape(); - tag = swf_InsertTag(tag,ST_DEFINETEXT); + textid = ++currentswfid; - swf_SetU16(tag, textid); - r.xmin = 0; - r.ymin = 0; - r.xmax = 20*sizex; - r.ymax = 20*sizey; - - swf_SetRect(tag,&r); - - m.sx = 65536; - m.sy = 65536; - m.r0 = 0; - m.r1 = 0; - m.tx = 0; - m.ty = 0; - - swf_SetMatrix(tag,&m); swflastx=swflasty=0; } @@ -1293,32 +1368,24 @@ static void endshape() swf_ShapeSetEnd(tag); if(shapeisempty) { - msg(" empty shape"); - // TODO: delete tag + // delete the tag again, we didn't do anything + TAG*todel = tag; + tag = tag->prev; + swf_DeleteTag(todel); + } else { + /* TODO: fix bounding box */ + tag = swf_InsertTag(tag,ST_PLACEOBJECT2); + swf_ObjectPlace(tag,shapeid,/*depth*/depth++,NULL,NULL,NULL); } - - tag = swf_InsertTag(tag,ST_PLACEOBJECT2); - swf_ObjectPlace(tag,shapeid,/*depth*/depth++,NULL,NULL,NULL); shapeid = -1; } -static void endtext() -{ - if(textid<0) - return; - putcharacters(tag); - swf_SetU8(tag,0); - tag = swf_InsertTag(tag,ST_PLACEOBJECT2); - swf_ObjectPlace(tag,textid,/*depth*/depth++,NULL,NULL,NULL); - textid = -1; -} - static void endpage(struct swfoutput*obj) { if(shapeid>=0) endshape(); if(textid>=0) - endtext(); + endtext(obj); while(clippos) swfoutput_endclip(obj); @@ -1344,8 +1411,7 @@ void swfoutput_newpage(struct swfoutput*obj) depth = startdepth; } -/* "destroy" like in (oo-terminology) "destructor". Perform cleaning - up, complete the swf, and write it out. */ +/* Perform cleaning up, complete the swf, and write it out. */ void swfoutput_destroy(struct swfoutput* obj) { endpage(obj); @@ -1354,6 +1420,8 @@ void swfoutput_destroy(struct swfoutput* obj) TAG*mtag = swf.firstTag; if(iterator->swffont) { mtag = swf_InsertTag(mtag, ST_DEFINEFONT2); + /*if(!storeallcharacters) + swf_FontReduce(iterator->swffont);*/ swf_FontSetDefine2(mtag, iterator->swffont); swf_FontFree(iterator->swffont); } @@ -1377,7 +1445,7 @@ void swfoutput_destroy(struct swfoutput* obj) tag = swf_InsertTag(tag,ST_END); - if(enablezlib) { + if(enablezlib || flashversion>=6) { if FAILED(swf_WriteSWC(fi,&swf)) msg(" WriteSWC() failed.\n"); } else { @@ -1392,7 +1460,7 @@ void swfoutput_destroy(struct swfoutput* obj) void swfoutput_setdrawmode(swfoutput* obj, int mode) { - drawmode = mode; + obj->drawmode = mode; if(mode == DRAWMODE_FILL) fill = 1; else if(mode == DRAWMODE_EOFILL) @@ -1449,7 +1517,7 @@ void swfoutput_setlinewidth(struct swfoutput*obj, double linewidth) void swfoutput_startclip(swfoutput*obj, SWF_OUTLINE*outline, struct swfmatrix*m) { if(textid>=0) - endtext(); + endtext(obj); if(shapeid>=0) endshape(); @@ -1460,7 +1528,7 @@ void swfoutput_startclip(swfoutput*obj, SWF_OUTLINE*outline, struct swfmatrix*m) } startshape(obj); - int olddrawmode = drawmode; + int olddrawmode = obj->drawmode; swfoutput_setdrawmode(obj, DRAWMODE_CLIP); swfoutput_drawpath(obj, outline, m); swf_ShapeSetEnd(tag); @@ -1477,7 +1545,7 @@ void swfoutput_startclip(swfoutput*obj, SWF_OUTLINE*outline, struct swfmatrix*m) void swfoutput_endclip(swfoutput*obj) { if(textid>=0) - endtext(); + endtext(obj); if(shapeid>=0) endshape(); @@ -1507,7 +1575,7 @@ void swfoutput_linktourl(struct swfoutput*obj, char*url, swfcoord*points) if(shapeid>=0) endshape(); if(textid>=0) - endtext(); + endtext(obj); if(opennewwindow) actions = action_GetUrl(0, url, "_parent"); @@ -1524,7 +1592,7 @@ void swfoutput_linktopage(struct swfoutput*obj, int page, swfcoord*points) if(shapeid>=0) endshape(); if(textid>=0) - endtext(); + endtext(obj); actions = action_GotoFrame(0, page); actions = action_End(actions); @@ -1544,7 +1612,7 @@ void swfoutput_namedlink(struct swfoutput*obj, char*name, swfcoord*points) if(shapeid>=0) endshape(); if(textid>=0) - endtext(); + endtext(obj); if(!strncmp(tmp, "call:", 5)) { @@ -1811,7 +1879,7 @@ int swfoutput_drawimagejpeg_old(struct swfoutput*obj, char*filename, int sizex,i if(shapeid>=0) endshape(); if(textid>=0) - endtext(); + endtext(obj); int bitid = ++currentswfid; oldtag = tag; @@ -1839,7 +1907,7 @@ int swfoutput_drawimagejpeg(struct swfoutput*obj, RGBA*mem, int sizex,int sizey, if(shapeid>=0) endshape(); if(textid>=0) - endtext(); + endtext(obj); int bitid = ++currentswfid; oldtag = tag; @@ -1860,7 +1928,7 @@ int swfoutput_drawimagelossless(struct swfoutput*obj, RGBA*mem, int sizex,int si if(shapeid>=0) endshape(); if(textid>=0) - endtext(); + endtext(obj); int bitid = ++currentswfid; oldtag = tag; @@ -1887,7 +1955,7 @@ int swfoutput_drawimagelosslessN(struct swfoutput*obj, U8*mem, RGBA*pal, int siz if(shapeid>=0) endshape(); if(textid>=0) - endtext(); + endtext(obj); if(sizex&3) { @@ -1931,7 +1999,7 @@ void swfoutput_drawimageagain(struct swfoutput*obj, int id, int sizex,int sizey, if(shapeid>=0) endshape(); if(textid>=0) - endtext(); + endtext(obj); drawimage(obj, id, sizex, sizey, x1,y1,x2,y2,x3,y3,x4,y4); }