X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=pdf2swf%2Fswfoutput.cc;h=5d1c10f7a94dfa9535e0017e9be2bb56dd180471;hb=5eb026e91bef063b683796fbbc03158d5711a4e4;hp=9125528afd8ba1bfb8a0fa6837c0bc4dab8faff4;hpb=977dcba7eb46216ad280ada2d970a7450856bc3b;p=swftools.git diff --git a/pdf2swf/swfoutput.cc b/pdf2swf/swfoutput.cc index 9125528..5d1c10f 100644 --- a/pdf2swf/swfoutput.cc +++ b/pdf2swf/swfoutput.cc @@ -47,6 +47,8 @@ int insertstoptag=0; int flashversion=5; int splinemaxerror=1; int fontsplinemaxerror=1; +int filloverlap=0; +float minlinewidth=0.05; static char storefont = 0; static int flag_protected = 0; @@ -63,6 +65,7 @@ static int currentswfid = 0; static int depth = 1; static int startdepth = 1; static int linewidth = 0; +static SRECT lastpagesize; static SHAPE* shape; static int shapeid = -1; @@ -92,7 +95,7 @@ SRECT bboxrect; static void startshape(struct swfoutput* obj); static void starttext(struct swfoutput* obj); -static void endshape(int clip); +static void endshape(struct swfoutput* obj,int clip); static void endtext(struct swfoutput* obj); // matrix multiplication. changes p0 @@ -119,7 +122,13 @@ static int moveto(TAG*tag, plotxy p0) } return 0; } - +static int moveto(TAG*tag, float x, float y) +{ + plotxy p; + p.x = x; + p.y = y; + return moveto(tag, p); +} static void addPointToBBox(int px, int py) { SPOINT p; @@ -150,6 +159,14 @@ static void lineto(TAG*tag, plotxy p0) swflastx+=rx; swflasty+=ry; } +static void lineto(TAG*tag, double x, double y) +{ + plotxy p; + p.x = x; + p.y = y; + lineto(tag, p); +} + // write a spline-to command into the swf static void splineto(TAG*tag, plotxy control,plotxy end) @@ -264,13 +281,14 @@ void drawpath(struct swfoutput*output, SWF_OUTLINE*outline, struct swfmatrix*m, y += (outline->dest.y/(float)0xffff); if(outline->type == SWF_PATHTYPE_MOVE) { - if(!init && fill && output->drawmode != DRAWMODE_EOFILL && !ignoredraworder) { + //if(!init && fill && output->drawmode != DRAWMODE_EOFILL && !ignoredraworder) { + if(filloverlap && !init && fill && output->drawmode != DRAWMODE_EOFILL) { /* drawmode=FILL (not EOFILL) means that seperate shapes do not cancel each other out. On SWF side, we need to start a new shape for each closed polygon, because SWF only knows EOFILL. */ - endshape(0); + endshape(output,0); startshape(output); startFill(); } @@ -495,7 +513,7 @@ void drawShortPathWithEnds(struct swfoutput*output, double x, double y, struct s int back = 0; if(line_cap == LINE_CAP_BUTT || line_cap == LINE_CAP_SQUARE) { - endshape(0); + endshape(output,0); startshape(output); SWF_OUTLINE *last, *tmp=outline; plotxy s,e,p0,p1,p2,p3,m0,m1,m2,m3; @@ -574,7 +592,7 @@ void drawShortPathWithEnds(struct swfoutput*output, double x, double y, struct s if(line_cap == LINE_CAP_BUTT) { lineto(tag, q0); - endshape(depth+2-nr); + endshape(output, depth+2-nr); startshape(output); } p0 = m0; @@ -589,7 +607,7 @@ void drawShortPathWithEnds(struct swfoutput*output, double x, double y, struct s drawShortPath(output,x,y,m,outline); if(line_cap == LINE_CAP_BUTT) { - endshape(0); + endshape(output,0); startshape(output); } } @@ -651,7 +669,7 @@ void drawShortPathWithStraightEnds(struct swfoutput*output, double x, double y, need to draw) are very likely to overlap. To avoid that they cancel each other out at the end points, start a new shape for the second one */ - endshape(0);startshape(output); + endshape(output,0);startshape(output); startFill(); } @@ -758,7 +776,7 @@ static inline int colorcompare(RGBA*a,RGBA*b) static const int CHARDATAMAX = 8192; struct chardata { int charid; - int fontid; + int fontid; /* TODO: use a SWFFONT instead */ int x; int y; int size; @@ -984,8 +1002,10 @@ struct fontlist_t fontlist_t*next; } *fontlist = 0; -/* todo: why don't higher values (64, 1024) work here? */ -#define FONT_INTERNAL_SIZE 1 +/* Notice: we can only put chars in the range -1639,1638 (-32768/20,32768/20). + So if we set this value to high, the char coordinates will overflow. + If we set it to low, however, the char positions will be inaccurate */ +#define FONT_INTERNAL_SIZE 4 /* process a character. */ static int drawchar(struct swfoutput*obj, SWFFONT *swffont, char*character, int charnr, int u, swfmatrix*m) @@ -1004,7 +1024,7 @@ static int drawchar(struct swfoutput*obj, SWFFONT *swffont, char*character, int } if(shapeid>=0) - endshape(0); + endshape(obj,0); if(textid<0) starttext(obj); @@ -1092,7 +1112,7 @@ void swfoutput_drawpath(swfoutput*output, SWF_OUTLINE*outline, so we better start a new shape here if the polygon is filled */ if(shapeid>=0 && fill && !ignoredraworder) { - endshape(0); + endshape(output,0); } if(shapeid<0) @@ -1111,7 +1131,7 @@ void swfoutput_drawpath2poly(struct swfoutput*output, SWF_OUTLINE*outline, struc if(textid>=0) endtext(output); if(shapeid>=0) - endshape(0); + endshape(output,0); assert(shapeid<0); startshape(output); stopFill(); @@ -1122,9 +1142,10 @@ void swfoutput_drawpath2poly(struct swfoutput*output, SWF_OUTLINE*outline, struc int getCharID(SWFFONT *font, int charnr, char *charname, int u) { int t; - if(charname) { + if(charname && font->glyphnames) { for(t=0;tnumchars;t++) { if(font->glyphnames[t] && !strcmp(font->glyphnames[t],charname)) { + msg(" Char [%d,>%s<,%d] maps to %d\n", charnr, charname, u, t); return t; } } @@ -1132,6 +1153,7 @@ int getCharID(SWFFONT *font, int charnr, char *charname, int u) we can find the capitalized version */ for(t=0;tnumchars;t++) { if(font->glyphnames[t] && !strcasecmp(font->glyphnames[t],charname)) { + msg(" Char [%d,>>%s<<,%d] maps to %d\n", charnr, charname, u, t); return t; } } @@ -1140,20 +1162,25 @@ int getCharID(SWFFONT *font, int charnr, char *charname, int u) if(u>0) { /* try to use the unicode id */ if(u>=0 && umaxascii && font->ascii2glyph[u]>=0) { + msg(" Char [%d,%s,>%d<] maps to %d\n", charnr, charname, u, font->ascii2glyph[u]); return font->ascii2glyph[u]; } } if(charnr>=0 && charnrnumchars) { + msg(" Char [>%d<,%s,%d] maps to %d\n", charnr, charname, u, charnr); 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]; - }*/ + if(font->encoding != FONT_ENCODING_UNICODE) { + /* the following only works if the font encoding + is US-ASCII based. It's needed for fonts which return broken unicode + indices */ + if(charnr>=0 && charnrmaxascii && font->ascii2glyph[charnr]>=0) { + msg(" Char [>%d<,%s,%d] maps to %d\n", charnr, charname, u, font->ascii2glyph[charnr]); + return font->ascii2glyph[charnr]; + } + } return -1; } @@ -1211,12 +1238,17 @@ 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 size=%d bbox=(%.2f,%.2f,%.2f,%.2f)\n", iii, swffont->glyphnames[iii], swffont->glyph2ascii[iii], swffont->glyph[iii].shape->bitlen, + msg(" | Glyph %d) name=%s, unicode=%d size=%d bbox=(%.2f,%.2f,%.2f,%.2f)\n", iii, swffont->glyphnames?swffont->glyphnames[iii]:"", swffont->glyph2ascii[iii], swffont->glyph[iii].shape->bitlen, swffont->layout->bounds[iii].xmin/20.0, swffont->layout->bounds[iii].ymin/20.0, swffont->layout->bounds[iii].xmax/20.0, swffont->layout->bounds[iii].ymax/20.0 ); + int t; + for(t=0;tmaxascii;t++) { + if(swffont->ascii2glyph[t] == iii) + msg(" | - maps to %d",t); + } } } @@ -1285,15 +1317,103 @@ int swfoutput_drawchar(struct swfoutput* obj,double x,double y,char*character, i return drawchar(obj, obj->swffont, character, charnr, u, &m); } +static void endpage(struct swfoutput*obj) +{ + if(shapeid>=0) + endshape(obj,0); + if(textid>=0) + endtext(obj); + while(clippos) + swfoutput_endclip(obj); + + if(insertstoptag) { + ActionTAG*atag=0; + atag = action_Stop(atag); + atag = action_End(atag); + tag = swf_InsertTag(tag,ST_DOACTION); + swf_ActionSet(tag,atag); + } + tag = swf_InsertTag(tag,ST_SHOWFRAME); +} + +static int firstpage = 1; +void swfoutput_newpage(struct swfoutput*obj, int pageNum, int x1, int y1, int x2, int y2) +{ + if(!firstpage) + endpage(obj); + + for(depth--;depth>=startdepth;depth--) { + tag = swf_InsertTag(tag,ST_REMOVEOBJECT2); + swf_SetU16(tag,depth); + } + depth = startdepth = 3; /* leave room for clip and background rectangle */ + + sizex = x2; + sizey = y2; + x1*=20;y1*=20;x2*=20;y2*=20; + + if(lastpagesize.xmin != x1 || + lastpagesize.xmax != x2 || + lastpagesize.ymin != y1 || + lastpagesize.ymax != y2) + {/* add white clipping rectangle */ + msg(" processing page %d (%dx%d)", pageNum,sizex,sizey); + + if(!firstpage) { + msg(" Page has a different size than previous ones"); + tag = swf_InsertTag(tag,ST_REMOVEOBJECT2); + swf_SetU16(tag,1); + tag = swf_InsertTag(tag,ST_REMOVEOBJECT2); + swf_SetU16(tag,2); + } + + RGBA rgb; + rgb.a = rgb.r = rgb.g = rgb.b = 0xff; + SRECT r; + SHAPE* s; + int ls1=0,fs1=0; + int shapeid = ++currentswfid; + r.xmin = x1; + r.ymin = y1; + r.xmax = x2; + r.ymax = y2; + tag = swf_InsertTag(tag, ST_DEFINESHAPE); + swf_ShapeNew(&s); + fs1 = swf_ShapeAddSolidFillStyle(s, &rgb); + swf_SetU16(tag,shapeid); + swf_SetRect(tag,&r); + swf_SetShapeHeader(tag,s); + swf_ShapeSetAll(tag,s,x1,y1,ls1,fs1,0); + swf_ShapeSetLine(tag,s,(x2-x1),0); + swf_ShapeSetLine(tag,s,0,(y2-y1)); + swf_ShapeSetLine(tag,s,(x1-x2),0); + swf_ShapeSetLine(tag,s,0,(y1-y2)); + swf_ShapeSetEnd(tag); + swf_ShapeFree(s); + tag = swf_InsertTag(tag, ST_PLACEOBJECT2); + swf_ObjectPlace(tag,shapeid,/*depth*/1,0,0,0); + tag = swf_InsertTag(tag, ST_PLACEOBJECT2); + swf_ObjectPlaceClip(tag,shapeid,/*depth*/2,0,0,0,65535); + } else { + msg(" processing page %d", pageNum); + } + + lastpagesize.xmin = x1; + lastpagesize.xmax = x2; + lastpagesize.ymin = y1; + lastpagesize.ymax = y2; + swf_ExpandRect2(&swf.movieSize, &lastpagesize); + + firstpage = 0; +} + /* initialize the swf writer */ -void swfoutput_init(struct swfoutput* obj, char*_filename, int x1, int y1, int x2, int y2) +void swfoutput_init(struct swfoutput* obj, char*_filename) { - RGBA rgb; SRECT r; + RGBA rgb; memset(obj, 0, sizeof(struct swfoutput)); filename = _filename; - sizex = x2; - sizey = y2; msg(" initializing swf output for size %d*%d\n", sizex,sizey); @@ -1301,54 +1421,24 @@ void swfoutput_init(struct swfoutput* obj, char*_filename, int x1, int y1, int x obj->drawmode = -1; memset(&swf,0x00,sizeof(SWF)); + memset(&lastpagesize,0x00,sizeof(SRECT)); swf.fileVersion = flashversion; swf.frameRate = 0x0040; // 1 frame per 4 seconds - swf.movieSize.xmin = 20*x1; - swf.movieSize.ymin = 20*y1; - swf.movieSize.xmax = 20*x2; - swf.movieSize.ymax = 20*y2; - - depth = 1; + swf.movieSize.xmin = 0; + swf.movieSize.ymin = 0; + swf.movieSize.xmax = 0; + swf.movieSize.ymax = 0; swf.firstTag = swf_InsertTag(NULL,ST_SETBACKGROUNDCOLOR); tag = swf.firstTag; rgb.a = rgb.r = rgb.g = rgb.b = 0xff; swf_SetRGB(tag,&rgb); - if(1)/* add white rectangle */ - { - SRECT r; - SHAPE* s; - int ls1=0,fs1=0; - int shapeid = ++currentswfid; - r.xmin = x1*20; - r.ymin = y1*20; - r.xmax = x2*20; - r.ymax = y2*20; - tag = swf_InsertTag(tag, ST_DEFINESHAPE); - swf_ShapeNew(&s); - fs1 = swf_ShapeAddSolidFillStyle(s, &rgb); - swf_SetU16(tag,shapeid); - swf_SetRect(tag,&r); - swf_SetShapeHeader(tag,s); - swf_ShapeSetAll(tag,s,x1*20,y1*20,ls1,fs1,0); - swf_ShapeSetLine(tag,s,20*(x2-x1),0); - swf_ShapeSetLine(tag,s,0,20*(y2-y1)); - swf_ShapeSetLine(tag,s,20*(x1-x2),0); - swf_ShapeSetLine(tag,s,0,20*(y1-y2)); - swf_ShapeSetEnd(tag); - swf_ShapeFree(s); - tag = swf_InsertTag(tag, ST_PLACEOBJECT2); - swf_ObjectPlace(tag,shapeid,depth++,0,0,0); - tag = swf_InsertTag(tag, ST_PLACEOBJECT2); - swf_ObjectPlaceClip(tag,shapeid,depth++,0,0,0,65535); - } - if(flag_protected) tag = swf_InsertTag(tag, ST_PROTECT); - startdepth = depth; + startdepth = depth = 0; } void swfoutput_setprotected() //write PROTECT tag @@ -1376,7 +1466,6 @@ static void startshape(struct swfoutput*obj) shapeid = ++currentswfid; swf_SetU16(tag,shapeid); // ID - /* TODO: patch back */ bboxrectpos = tag->len; r.xmin = 0; r.ymin = 0; @@ -1400,7 +1489,7 @@ static void startshape(struct swfoutput*obj) static void starttext(struct swfoutput*obj) { if(shapeid>=0) - endshape(0); + endshape(obj,0); textid = ++currentswfid; @@ -1430,21 +1519,72 @@ void changeRect(TAG*tag, int pos, SRECT*newrect) tag->pos = tag->readBit = 0; } -static void endshape(int clipdepth) +void cancelshape(swfoutput*obj) +{ + /* delete old shape tag */ + TAG*todel = tag; + tag = tag->prev; + swf_DeleteTag(todel); + shapeid = -1; + bboxrectpos = -1; +} + +void fixAreas(swfoutput*obj) +{ + if(!shapeisempty && fill && + (bboxrect.xmin == bboxrect.xmax || + bboxrect.ymin == bboxrect.ymax) && + minlinewidth >= 0.001 + ) { + msg(" Shape has size 0: width=%.2f height=%.2f", + (bboxrect.xmax-bboxrect.xmin)/20.0, + (bboxrect.ymax-bboxrect.ymin)/20.0 + ); + + SRECT r = bboxrect; + + if(r.xmin == r.xmax && r.ymin == r.ymax) { + /* this thing comes down to a single dot- nothing to fix here */ + return; + } + + cancelshape(obj); + + RGBA save_col = obj->strokergb; + int save_width = linewidth; + + obj->strokergb = obj->fillrgb; + linewidth = (int)(minlinewidth*20); + if(linewidth==0) linewidth = 1; + + startshape(obj); + + moveto(tag, r.xmin/20.0,r.ymin/20.0); + lineto(tag, r.xmax/20.0,r.ymax/20.0); + + obj->strokergb = save_col; + linewidth = save_width; + } + +} + +static void endshape(swfoutput*obj, int clipdepth) { if(shapeid<0) return; - swf_ShapeSetEnd(tag); - if(shapeisempty) { - // delete the tag again, we didn't do anything - TAG*todel = tag; - tag = tag->prev; - swf_DeleteTag(todel); - shapeid = -1; - bboxrectpos = -1; + if(!clipdepth) + fixAreas(obj); + + if(shapeisempty || + (bboxrect.xmin == bboxrect.xmax && bboxrect.ymin == bboxrect.ymax)) + { + // delete the shape again, we didn't do anything + cancelshape(obj); return; } + + swf_ShapeSetEnd(tag); changeRect(tag, bboxrectpos, &bboxrect); @@ -1458,37 +1598,6 @@ static void endshape(int clipdepth) bboxrectpos = -1; } -static void endpage(struct swfoutput*obj) -{ - if(shapeid>=0) - endshape(0); - if(textid>=0) - endtext(obj); - while(clippos) - swfoutput_endclip(obj); - - if(insertstoptag) { - ActionTAG*atag=0; - atag = action_Stop(atag); - atag = action_End(atag); - tag = swf_InsertTag(tag,ST_DOACTION); - swf_ActionSet(tag,atag); - } - tag = swf_InsertTag(tag,ST_SHOWFRAME); -} - -void swfoutput_newpage(struct swfoutput*obj) -{ - endpage(obj); - - for(depth--;depth>=startdepth;depth--) { - tag = swf_InsertTag(tag,ST_REMOVEOBJECT2); - swf_SetU16(tag,depth); - } - - depth = startdepth; -} - /* Perform cleaning up, complete the swf, and write it out. */ void swfoutput_destroy(struct swfoutput* obj) { @@ -1558,7 +1667,7 @@ void swfoutput_setfillcolor(swfoutput* obj, u8 r, u8 g, u8 b, u8 a) obj->fillrgb.b == b && obj->fillrgb.a == a) return; if(shapeid>=0) - endshape(0); + endshape(obj,0); obj->fillrgb.r = r; obj->fillrgb.g = g; @@ -1574,21 +1683,21 @@ void swfoutput_setstrokecolor(swfoutput* obj, u8 r, u8 g, u8 b, u8 a) obj->strokergb.a == a) return; if(shapeid>=0) - endshape(0); + endshape(obj,0); obj->strokergb.r = r; obj->strokergb.g = g; obj->strokergb.b = b; obj->strokergb.a = a; } -void swfoutput_setlinewidth(struct swfoutput*obj, double linewidth) +void swfoutput_setlinewidth(struct swfoutput*obj, double _linewidth) { - if(linewidth == (u16)(linewidth*20)) + if(linewidth == (u16)(_linewidth*20)) return; if(shapeid>=0) - endshape(0); - linewidth = (u16)(linewidth*20); + endshape(obj,0); + linewidth = (u16)(_linewidth*20); } @@ -1597,7 +1706,7 @@ void swfoutput_startclip(swfoutput*obj, SWF_OUTLINE*outline, struct swfmatrix*m) if(textid>=0) endtext(obj); if(shapeid>=0) - endshape(0); + endshape(obj,0); if(clippos >= 127) { @@ -1625,7 +1734,7 @@ void swfoutput_endclip(swfoutput*obj) if(textid>=0) endtext(obj); if(shapeid>=0) - endshape(0); + endshape(obj,0); if(!clippos) { msg(" Invalid end of clipping region"); @@ -1651,7 +1760,7 @@ void swfoutput_linktourl(struct swfoutput*obj, char*url, swfcoord*points) } if(shapeid>=0) - endshape(0); + endshape(obj,0); if(textid>=0) endtext(obj); @@ -1668,7 +1777,7 @@ void swfoutput_linktopage(struct swfoutput*obj, int page, swfcoord*points) ActionTAG* actions; if(shapeid>=0) - endshape(0); + endshape(obj,0); if(textid>=0) endtext(obj); @@ -1688,7 +1797,7 @@ void swfoutput_namedlink(struct swfoutput*obj, char*name, swfcoord*points) char mouseover = 1; if(shapeid>=0) - endshape(0); + endshape(obj,0); if(textid>=0) endtext(obj); @@ -1955,7 +2064,7 @@ int swfoutput_drawimagejpeg_old(struct swfoutput*obj, char*filename, int sizex,i { TAG*oldtag; if(shapeid>=0) - endshape(0); + endshape(obj,0); if(textid>=0) endtext(obj); @@ -1983,7 +2092,7 @@ int swfoutput_drawimagejpeg(struct swfoutput*obj, RGBA*mem, int sizex,int sizey, JPEGBITS*jpeg; if(shapeid>=0) - endshape(0); + endshape(obj,0); if(textid>=0) endtext(obj); @@ -2004,7 +2113,7 @@ int swfoutput_drawimagelossless(struct swfoutput*obj, RGBA*mem, int sizex,int si { TAG*oldtag; if(shapeid>=0) - endshape(0); + endshape(obj,0); if(textid>=0) endtext(obj); @@ -2031,7 +2140,7 @@ int swfoutput_drawimagelosslessN(struct swfoutput*obj, U8*mem, RGBA*pal, int siz TAG*oldtag; U8*mem2 = 0; if(shapeid>=0) - endshape(0); + endshape(obj,0); if(textid>=0) endtext(obj); @@ -2075,10 +2184,52 @@ void swfoutput_drawimageagain(struct swfoutput*obj, int id, int sizex,int sizey, { if(id<0) return; if(shapeid>=0) - endshape(0); + endshape(obj,0); if(textid>=0) endtext(obj); drawimage(obj, id, sizex, sizey, x1,y1,x2,y2,x3,y3,x4,y4); } +void swfoutput_setparameter(char*name, char*value) +{ + if(!strcmp(name, "drawonlyshapes")) { + drawonlyshapes = atoi(value); + } else if(!strcmp(name, "ignoredraworder")) { + ignoredraworder = atoi(value); + } else if(!strcmp(name, "filloverlap")) { + filloverlap = atoi(value); + } else if(!strcmp(name, "linksopennewwindow")) { + opennewwindow = atoi(value); + } else if(!strcmp(name, "opennewwindow")) { + opennewwindow = atoi(value); + } else if(!strcmp(name, "storeallcharacters")) { + storeallcharacters = atoi(value); + } else if(!strcmp(name, "enablezlib")) { + enablezlib = atoi(value); + } else if(!strcmp(name, "insertstop")) { + insertstoptag = atoi(value); + } else if(!strcmp(name, "flashversion")) { + flashversion = atoi(value); + } else if(!strcmp(name, "minlinewidth")) { + minlinewidth = atof(value); + } else if(!strcmp(name, "jpegquality")) { + int val = atoi(value); + if(val<0) val=0; + if(val>100) val=100; + jpegquality = val; + } else if(!strcmp(name, "splinequality")) { + int v = atoi(value); + v = 500-(v*5); // 100% = 0.25 pixel, 0% = 25 pixel + if(v<1) v = 1; + splinemaxerror = v; + } else if(!strcmp(name, "fontquality")) { + int v = atoi(value); + v = 500-(v*5); // 100% = 0.25 pixel, 0% = 25 pixel + if(v<1) v = 1; + fontsplinemaxerror = v; + } else { + fprintf(stderr, "unknown parameter: %s (=%s)\n", name, value); + } +} +