X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=pdf2swf%2Fswfoutput.cc;h=1c518a258ea720b86fe1aac55783c6cc032b6cfb;hb=8a43f8d64a791c1a71db2b5a6b9b6ea21ffe32c3;hp=b8b96e94221259613f36843aa6d4b7b62acbf9c5;hpb=5ca580d4583834edd01e83a901d1ec416c3033a1;p=swftools.git diff --git a/pdf2swf/swfoutput.cc b/pdf2swf/swfoutput.cc index b8b96e9..1c518a2 100644 --- a/pdf2swf/swfoutput.cc +++ b/pdf2swf/swfoutput.cc @@ -72,6 +72,8 @@ float config_minlinewidth=0.05; typedef struct _swfoutput_internal { + SWF swf; + fontlist_t* fontlist; char storefont; @@ -111,6 +113,7 @@ typedef struct _swfoutput_internal chardata_t chardata[CHARDATAMAX]; int chardatapos; int firstpage; + char pagefinished; } swfoutput_internal; static swfoutput_internal* init_internal_struct() @@ -141,6 +144,7 @@ static swfoutput_internal* init_internal_struct() i->bboxrectpos = -1; i->chardatapos = 0; i->firstpage = 1; + i->pagefinished = 1; return i; }; @@ -1226,7 +1230,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]); @@ -1292,10 +1296,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); @@ -1397,6 +1422,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; @@ -1411,17 +1445,19 @@ static void endpage(struct swfoutput*obj) 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) + if(!i->firstpage && !i->pagefinished) endpage(obj); swf_GetMatrix(0, &i->page_matrix); - i->page_matrix.tx = movex; - i->page_matrix.ty = movey; + i->page_matrix.tx = movex*20; + i->page_matrix.ty = movey*20; for(i->depth--;i->depth>=i->startdepth;i->depth--) { i->tag = swf_InsertTag(i->tag,ST_REMOVEOBJECT2); swf_SetU16(i->tag,i->depth); } + /* TODO: this should all be done in SWFOutputDev */ + i->depth = i->startdepth = 3; /* leave room for clip and background rectangle */ i->sizex = x2; @@ -1478,9 +1514,10 @@ void swfoutput_newpage(struct swfoutput*obj, int pageNum, int movex, int movey, i->lastpagesize.xmax = x2; i->lastpagesize.ymin = y1; i->lastpagesize.ymax = y2; - swf_ExpandRect2(&obj->swf.movieSize, &i->lastpagesize); + swf_ExpandRect2(&i->swf.movieSize, &i->lastpagesize); i->firstpage = 0; + i->pagefinished = 0; } /* initialize the swf writer */ @@ -1499,18 +1536,18 @@ void swfoutput_init(struct swfoutput* obj) obj->swffont = 0; obj->drawmode = -1; - memset(&obj->swf,0x00,sizeof(SWF)); + memset(&i->swf,0x00,sizeof(SWF)); memset(&i->lastpagesize,0x00,sizeof(SRECT)); - obj->swf.fileVersion = config_flashversion; - obj->swf.frameRate = 0x0040; // 1 frame per 4 seconds - obj->swf.movieSize.xmin = 0; - obj->swf.movieSize.ymin = 0; - obj->swf.movieSize.xmax = 0; - obj->swf.movieSize.ymax = 0; + i->swf.fileVersion = config_flashversion; + i->swf.frameRate = 0x0040; // 1 frame per 4 seconds + i->swf.movieSize.xmin = 0; + i->swf.movieSize.ymin = 0; + i->swf.movieSize.xmax = 0; + i->swf.movieSize.ymax = 0; - obj->swf.firstTag = swf_InsertTag(NULL,ST_SETBACKGROUNDCOLOR); - i->tag = obj->swf.firstTag; + i->swf.firstTag = swf_InsertTag(NULL,ST_SETBACKGROUNDCOLOR); + i->tag = i->swf.firstTag; rgb.a = rgb.r = rgb.g = rgb.b = 0xff; swf_SetRGB(i->tag,&rgb); @@ -1696,13 +1733,17 @@ static void endshape(swfoutput*obj, int clipdepth) i->bboxrectpos = -1; } -int 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 + endpage(obj); fontlist_t *tmp,*iterator = i->fontlist; while(iterator) { - TAG*mtag = obj->swf.firstTag; + TAG*mtag = i->swf.firstTag; if(iterator->swffont) { mtag = swf_InsertTag(mtag, ST_DEFINEFONT2); /*if(!storeallcharacters) @@ -1712,8 +1753,33 @@ int swfoutput_save(struct swfoutput* obj, char*filename) iterator = iterator->next; } - int fi; + i->tag = swf_InsertTag(i->tag,ST_END); +} +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 @@ -1723,14 +1789,12 @@ int swfoutput_save(struct swfoutput* obj, char*filename) msg(" Could not create \"%s\". ", FIXNULL(filename)); return 0; } - - i->tag = swf_InsertTag(i->tag,ST_END); - + if(config_enablezlib || config_flashversion>=6) { - if FAILED(swf_WriteSWC(fi,&obj->swf)) + if FAILED(swf_WriteSWC(fi,&i->swf)) msg(" WriteSWC() failed.\n"); } else { - if FAILED(swf_WriteSWF(fi,&obj->swf)) + if FAILED(swf_WriteSWF(fi,&i->swf)) msg(" WriteSWF() failed.\n"); } @@ -1758,7 +1822,7 @@ void swfoutput_destroy(struct swfoutput* obj) iterator = iterator->next; delete tmp; } - swf_FreeTags(&obj->swf); + swf_FreeTags(&i->swf); free(i);i=0; memset(obj, 0, sizeof(swfoutput));