X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=pdf2swf%2Fswfoutput.cc;h=1c12e46a5dc0a7db68bc023227c900b1fa00cb15;hb=577e282e21131c72d58c7fad098a50beacdf5daa;hp=b0c5f16a217f86c9351818c1af753dd5196091c7;hpb=c61f68266148205e5ba6f0c6550408e619566c5c;p=swftools.git diff --git a/pdf2swf/swfoutput.cc b/pdf2swf/swfoutput.cc index b0c5f16..1c12e46 100644 --- a/pdf2swf/swfoutput.cc +++ b/pdf2swf/swfoutput.cc @@ -72,17 +72,19 @@ float config_minlinewidth=0.05; typedef struct _swfoutput_internal { + SWF swf; + fontlist_t* fontlist; char storefont; - - SWF swf; + + MATRIX page_matrix; + TAG *tag; int currentswfid; int depth; int startdepth; int linewidth; - SRECT lastpagesize; SHAPE* shape; int shapeid; @@ -95,21 +97,27 @@ typedef struct _swfoutput_internal int lastwasfill; int shapeisempty; char fill; - int sizex; - int sizey; + int min_x,max_x; + int min_y,max_y; TAG* cliptags[128]; int clipshapes[128]; U32 clipdepths[128]; int clippos; + + int frameno; + int lastframeno; char fillstylechanged; int bboxrectpos; SRECT bboxrect; + + TAG*cliptag; chardata_t chardata[CHARDATAMAX]; int chardatapos; int firstpage; + char pagefinished; } swfoutput_internal; static swfoutput_internal* init_internal_struct() @@ -125,6 +133,8 @@ static swfoutput_internal* init_internal_struct() i->linewidth = 0; i->shapeid = -1; i->textid = -1; + i->frameno = 0; + i->lastframeno = 0; i->fillstyleid; i->linestyleid; @@ -140,6 +150,7 @@ static swfoutput_internal* init_internal_struct() i->bboxrectpos = -1; i->chardatapos = 0; i->firstpage = 1; + i->pagefinished = 1; return i; }; @@ -629,15 +640,15 @@ void drawShortPathWithEnds(struct swfoutput*obj, double x, double y, struct swfm if(dir) { /* FIXME: box should be smaller */ q0.x = 0; q0.y = 0; - q1.x = i->sizex; q1.y = 0; - q2.x = i->sizex; q2.y = i->sizey; - q3.x = 0; q3.y = i->sizey; + 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->sizex; q0.y = i->sizey; - q1.x = 0; q1.y = i->sizey; + 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->sizex; q3.y = 0; + q3.x = i->max_x; q3.y = 0; } q4.x = p0.x; q4.y = p0.y; @@ -1149,13 +1160,17 @@ static void endtext(swfoutput*obj) swf_SetRect(i->tag,&r); MATRIX m; - swf_GetMatrix(0, &m); + swf_GetMatrix(0, &m); /* set unit matrix- the real matrix is in the placeobject */ swf_SetMatrix(i->tag,&m); putcharacters(obj, i->tag); swf_SetU8(i->tag,0); i->tag = swf_InsertTag(i->tag,ST_PLACEOBJECT2); - swf_ObjectPlace(i->tag,i->textid,/*depth*/i->depth++,&obj->fontmatrix,NULL,NULL); + //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); i->textid = -1; } @@ -1221,7 +1236,7 @@ int getCharID(SWFFONT *font, int charnr, char *charname, int u) } } - if(u>0) { + if(u>0 && font->encoding != 255) { /* 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]); @@ -1287,10 +1302,31 @@ void swfoutput_setfont(struct swfoutput*obj, char*fontid, char*filename) msg(" Couldn't load font %s (%s)", fontid, filename); swffont = swf_LoadFont(0); } + + if(swffont->glyph2ascii) { + int t; + int bad = 0; + /* check whether the Unicode indices look o.k. + If they don't, disable the unicode lookup by setting + the encoding to 255 */ + for(t=0;tnumchars;t++) { + int c = swffont->glyph2ascii[t]; + if(c && c < 32 && swffont->glyph[t].shape->bitlen > 16) { + // the character maps into the unicode control character range + // between 0001-001f. Yet it is not empty. Treat the one + // mapping as broken, and look how many of those we find. + bad ++; + } + } + if(bad>5) { + msg(" Font %s has bad unicode mapping", swffont->name); + swffont->encoding = 255; + } + } swf_FontSetID(swffont, ++i->currentswfid); - if(screenloglevel >= LOGLEVEL_DEBUG) { + if(getScreenLogLevel() >= LOGLEVEL_DEBUG) { // print font information msg(" Font %s (%s)",swffont->name, filename); msg(" | ID: %d", swffont->id); @@ -1392,6 +1428,15 @@ static void endpage(struct swfoutput*obj) endtext(obj); while(i->clippos) swfoutput_endclip(obj); + i->pagefinished = 1; +} + +void swfoutput_pagefeed(struct swfoutput*obj) +{ + swfoutput_internal*i = (swfoutput_internal*)obj->internal; + + if(!i->pagefinished) + endpage(obj); if(config_insertstoptag) { ActionTAG*atag=0; @@ -1401,77 +1446,91 @@ static void endpage(struct swfoutput*obj) swf_ActionSet(i->tag,atag); } i->tag = swf_InsertTag(i->tag,ST_SHOWFRAME); + i->frameno ++; + + for(i->depth--;i->depth>=i->startdepth;i->depth--) { + i->tag = swf_InsertTag(i->tag,ST_REMOVEOBJECT2); + swf_SetU16(i->tag,i->depth); + } + i->depth = i->startdepth; } -void swfoutput_newpage(struct swfoutput*obj, int pageNum, int x1, int y1, int x2, int y2) +static void setBackground(struct swfoutput*obj, int x1, int y1, int x2, int y2) { swfoutput_internal*i = (swfoutput_internal*)obj->internal; - if(!i->firstpage) + RGBA rgb; + rgb.a = rgb.r = rgb.g = rgb.b = 0xff; + SRECT r; + SHAPE* s; + int ls1=0,fs1=0; + int shapeid = ++i->currentswfid; + r.xmin = x1; + r.ymin = y1; + r.xmax = x2; + r.ymax = y2; + i->tag = swf_InsertTag(i->tag, ST_DEFINESHAPE); + swf_ShapeNew(&s); + fs1 = swf_ShapeAddSolidFillStyle(s, &rgb); + swf_SetU16(i->tag,shapeid); + swf_SetRect(i->tag,&r); + swf_SetShapeHeader(i->tag,s); + swf_ShapeSetAll(i->tag,s,x1,y1,ls1,fs1,0); + swf_ShapeSetLine(i->tag,s,(x2-x1),0); + swf_ShapeSetLine(i->tag,s,0,(y2-y1)); + swf_ShapeSetLine(i->tag,s,(x1-x2),0); + swf_ShapeSetLine(i->tag,s,0,(y1-y2)); + swf_ShapeSetEnd(i->tag); + swf_ShapeFree(s); + i->tag = swf_InsertTag(i->tag, ST_PLACEOBJECT2); + swf_ObjectPlace(i->tag,shapeid,i->depth++,0,0,0); + i->tag = swf_InsertTag(i->tag, ST_PLACEOBJECT2); + swf_ObjectPlaceClip(i->tag,shapeid,i->depth++,0,0,0,65535); + i->cliptag = i->tag; +} + +void swfoutput_newpage(struct swfoutput*obj, int pageNum, int movex, int movey, int x1, int y1, int x2, int y2) +{ + swfoutput_internal*i = (swfoutput_internal*)obj->internal; + if(!i->firstpage && !i->pagefinished) endpage(obj); - for(i->depth--;i->depth>=i->startdepth;i->depth--) { - i->tag = swf_InsertTag(i->tag,ST_REMOVEOBJECT2); - swf_SetU16(i->tag,i->depth); + swf_GetMatrix(0, &i->page_matrix); + i->page_matrix.tx = movex*20; + i->page_matrix.ty = movey*20; + + if(i->cliptag && i->frameno == i->lastframeno) { + SWFPLACEOBJECT obj; + swf_GetPlaceObject(i->cliptag, &obj); + obj.clipdepth = i->depth++; + swf_ResetTag(i->cliptag, i->cliptag->id); + swf_SetPlaceObject(i->cliptag, &obj); + swf_PlaceObjectFree(&obj); } - i->depth = i->startdepth = 3; /* leave room for clip and background rectangle */ - i->sizex = x2; - i->sizey = y2; - x1*=20;y1*=20;x2*=20;y2*=20; + i->min_x = x1; + i->min_y = y1; + i->max_x = x2; + i->max_y = y2; + + msg(" processing page %d (%dx%d:%d:%d)", pageNum,x2-x1,y2-y1, x1, y1); - if(i->lastpagesize.xmin != x1 || - i->lastpagesize.xmax != x2 || - i->lastpagesize.ymin != y1 || - i->lastpagesize.ymax != y2) - {/* add white clipping rectangle */ - msg(" processing page %d (%dx%d)", pageNum,i->sizex,i->sizey); - - if(!i->firstpage) { - msg(" Page has a different size than previous ones"); - i->tag = swf_InsertTag(i->tag,ST_REMOVEOBJECT2); - swf_SetU16(i->tag,1); - i->tag = swf_InsertTag(i->tag,ST_REMOVEOBJECT2); - swf_SetU16(i->tag,2); - } + x1*=20;y1*=20;x2*=20;y2*=20; - RGBA rgb; - rgb.a = rgb.r = rgb.g = rgb.b = 0xff; - SRECT r; - SHAPE* s; - int ls1=0,fs1=0; - int shapeid = ++i->currentswfid; - r.xmin = x1; - r.ymin = y1; - r.xmax = x2; - r.ymax = y2; - i->tag = swf_InsertTag(i->tag, ST_DEFINESHAPE); - swf_ShapeNew(&s); - fs1 = swf_ShapeAddSolidFillStyle(s, &rgb); - swf_SetU16(i->tag,shapeid); - swf_SetRect(i->tag,&r); - swf_SetShapeHeader(i->tag,s); - swf_ShapeSetAll(i->tag,s,x1,y1,ls1,fs1,0); - swf_ShapeSetLine(i->tag,s,(x2-x1),0); - swf_ShapeSetLine(i->tag,s,0,(y2-y1)); - swf_ShapeSetLine(i->tag,s,(x1-x2),0); - swf_ShapeSetLine(i->tag,s,0,(y1-y2)); - swf_ShapeSetEnd(i->tag); - swf_ShapeFree(s); - i->tag = swf_InsertTag(i->tag, ST_PLACEOBJECT2); - swf_ObjectPlace(i->tag,shapeid,/*depth*/1,0,0,0); - i->tag = swf_InsertTag(i->tag, ST_PLACEOBJECT2); - swf_ObjectPlaceClip(i->tag,shapeid,/*depth*/2,0,0,0,65535); - } else { - msg(" processing page %d", pageNum); - } + /* set clipping/background rectangle */ + /* TODO: this should all be done in SWFOutputDev */ + setBackground(obj, x1, y1, x2, y2); - i->lastpagesize.xmin = x1; - i->lastpagesize.xmax = x2; - i->lastpagesize.ymin = y1; - i->lastpagesize.ymax = y2; - swf_ExpandRect2(&i->swf.movieSize, &i->lastpagesize); + /* increase SWF's bounding box */ + SRECT r; + r.xmin = x1; + r.ymin = y1; + r.xmax = x2; + r.ymax = y2; + swf_ExpandRect2(&i->swf.movieSize, &r); + i->lastframeno = i->frameno; i->firstpage = 0; + i->pagefinished = 0; } /* initialize the swf writer */ @@ -1485,13 +1544,12 @@ void swfoutput_init(struct swfoutput* obj) SRECT r; RGBA rgb; - msg(" initializing swf output for size %d*%d\n", i->sizex,i->sizey); + msg(" initializing swf output for size %d*%d\n", i->max_x,i->max_y); obj->swffont = 0; obj->drawmode = -1; memset(&i->swf,0x00,sizeof(SWF)); - memset(&i->lastpagesize,0x00,sizeof(SRECT)); i->swf.fileVersion = config_flashversion; i->swf.frameRate = 0x0040; // 1 frame per 4 seconds @@ -1505,7 +1563,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 = 0; + i->startdepth = i->depth = 3; /* leave room for clip and background rectangle */ if(config_protect) i->tag = swf_InsertTag(i->tag, ST_PROTECT); @@ -1535,8 +1593,8 @@ static void startshape(struct swfoutput*obj) i->bboxrectpos = i->tag->len; r.xmin = 0; r.ymin = 0; - r.xmax = 20*i->sizex; - r.ymax = 20*i->sizey; + r.xmax = 20*i->max_x; + r.ymax = 20*i->max_y; swf_SetRect(i->tag,&r); memset(&i->bboxrect, 0, sizeof(i->bboxrect)); @@ -1662,8 +1720,15 @@ static void endshape(swfoutput*obj, int clipdepth) fixAreas(obj); if(i->shapeisempty || + /*bbox empty?*/ (i->bboxrect.xmin == i->bboxrect.xmax && - i->bboxrect.ymin == i->bboxrect.ymax)) + i->bboxrect.ymin == i->bboxrect.ymax) || + /*bbox outside page?*/ + (i->bboxrect.xmax <= i->min_x || + i->bboxrect.ymax <= i->min_y || + i->bboxrect.xmin >= i->max_x || + i->bboxrect.ymin >= i->max_y) + ) { // delete the shape again, we didn't do anything cancelshape(obj); @@ -1675,10 +1740,11 @@ static void endshape(swfoutput*obj, int clipdepth) changeRect(obj, i->tag, i->bboxrectpos, &i->bboxrect); i->tag = swf_InsertTag(i->tag,ST_PLACEOBJECT2); + if(clipdepth) - swf_ObjectPlaceClip(i->tag,i->shapeid,i->depth++,NULL,NULL,NULL,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++,NULL,NULL,NULL); + swf_ObjectPlace(i->tag,i->shapeid,/*depth*/i->depth++,&i->page_matrix,NULL,NULL); swf_ShapeFree(i->shape); i->shape = 0; @@ -1686,9 +1752,16 @@ static void endshape(swfoutput*obj, int clipdepth) i->bboxrectpos = -1; } -void swfoutput_save(struct swfoutput* obj, char*filename) +void swfoutput_finalize(struct swfoutput*obj) { swfoutput_internal*i = (swfoutput_internal*)obj->internal; + + if(i->tag && i->tag->id == ST_END) + return; //already done + + if(i->frameno == i->lastframeno) // fix: add missing pagefeed + swfoutput_pagefeed(obj); + endpage(obj); fontlist_t *tmp,*iterator = i->fontlist; while(iterator) { @@ -1702,8 +1775,42 @@ void swfoutput_save(struct swfoutput* obj, char*filename) iterator = iterator->next; } - int fi; + i->tag = swf_InsertTag(i->tag,ST_END); + TAG* tag = i->tag->prev; + + /* remove the removeobject2 tags between the last ST_SHOWFRAME + and the ST_END- they confuse the flash player */ + while(tag->id == ST_REMOVEOBJECT2) { + TAG* prev = tag->prev; + swf_DeleteTag(tag); + tag = prev; + } +} + +SWF* swfoutput_get(struct swfoutput*obj) +{ + swfoutput_internal*i = (swfoutput_internal*)obj->internal; + swfoutput_finalize(obj); + + return swf_CopySWF(&i->swf); +} + +void swfoutput_getdimensions(struct swfoutput*obj, int*x1, int*y1, int*x2, int*y2) +{ + swfoutput_internal*i = (swfoutput_internal*)obj->internal; + if(x1) *x1 = i->swf.movieSize.xmin/20; + if(y1) *y1 = i->swf.movieSize.ymin/20; + if(x2) *x2 = i->swf.movieSize.xmax/20; + if(y2) *y2 = i->swf.movieSize.ymax/20; +} + +int swfoutput_save(struct swfoutput* obj, char*filename) +{ + swfoutput_internal*i = (swfoutput_internal*)obj->internal; + swfoutput_finalize(obj); + + int fi; if(filename) fi = open(filename, O_BINARY|O_CREAT|O_TRUNC|O_WRONLY, 0777); else @@ -1711,11 +1818,9 @@ void swfoutput_save(struct swfoutput* obj, char*filename) if(fi<=0) { msg(" Could not create \"%s\". ", FIXNULL(filename)); - exit(1); + return 0; } - - i->tag = swf_InsertTag(i->tag,ST_END); - + if(config_enablezlib || config_flashversion>=6) { if FAILED(swf_WriteSWC(fi,&i->swf)) msg(" WriteSWC() failed.\n"); @@ -1727,17 +1832,22 @@ void swfoutput_save(struct swfoutput* obj, char*filename) if(filename) close(fi); msg(" SWF written\n"); + return 1; } /* Perform cleaning up, complete the swf, and write it out. */ void swfoutput_destroy(struct swfoutput* obj) { swfoutput_internal*i = (swfoutput_internal*)obj->internal; + if(!i) { + /* not initialized yet- nothing to destroy */ + return; + } fontlist_t *tmp,*iterator = i->fontlist; while(iterator) { if(iterator->swffont) { - swf_FontFree(iterator->swffont); + swf_FontFree(iterator->swffont);iterator->swffont=0; } tmp = iterator; iterator = iterator->next; @@ -1852,7 +1962,7 @@ void swfoutput_endclip(swfoutput*obj) return; } i->clippos--; - swf_ObjectPlaceClip(i->cliptags[i->clippos],i->clipshapes[i->clippos],i->clipdepths[i->clippos],NULL,NULL,NULL,i->depth++); + 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); @@ -2076,14 +2186,18 @@ static void drawlink(struct swfoutput*obj, ActionTAG*actions1, ActionTAG*actions i->tag = swf_InsertTag(i->tag,ST_PLACEOBJECT2); if(posx!=0 || posy!=0) { + SPOINT p; + p.x = (int)(posx*20); + p.y = (int)(posy*20); + p = swf_TurnPoint(p, &i->page_matrix); MATRIX m; - swf_GetMatrix(0,&m); - m.tx = (int)(posx*20); - m.ty = (int)(posy*20); + 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++,0,0,0); + swf_ObjectPlace(i->tag, buttonid, i->depth++,&i->page_matrix,0,0); } } @@ -2171,7 +2285,8 @@ static void drawimage(struct swfoutput*obj, int bitid, int sizex,int sizey, /* instance */ i->tag = swf_InsertTag(i->tag,ST_PLACEOBJECT2); - swf_ObjectPlace(i->tag,myshapeid,/*depth*/i->depth++,NULL,NULL,NULL); + + swf_ObjectPlace(i->tag,myshapeid,/*depth*/i->depth++,&i->page_matrix,NULL,NULL); } int swfoutput_drawimagejpeg_old(struct swfoutput*obj, char*filename, int sizex,int sizey,