X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fswfdump.c;h=3df34df44689d09012bbc1dd9283536feeaeae14;hb=fc815311aa1bd67877b404493838dfd85a86f596;hp=0020661b6d19580d8410d5fb598952ae4e6622de;hpb=8f05e89aea4b0bf754a87d32a638dcef9086e83e;p=swftools.git diff --git a/src/swfdump.c b/src/swfdump.c index 0020661..3df34df 100644 --- a/src/swfdump.c +++ b/src/swfdump.c @@ -298,7 +298,7 @@ void dumpFont(TAG*tag, char*prefix) { SWFFONT* font = malloc(sizeof(SWFFONT)); memset(font, 0, sizeof(SWFFONT)); - if(tag->id == ST_DEFINEFONT2) { + if(tag->id == ST_DEFINEFONT2 || tag->id == ST_DEFINEFONT3) { swf_FontExtract_DefineFont2(0, font, tag); } else if(tag->id == ST_DEFINEFONT) { swf_FontExtract_DefineFont(0, font, tag); @@ -375,9 +375,9 @@ void dumpFont(TAG*tag, char*prefix) swf_FontFree(font); } -SWF swf; -int fontnum = 0; -SWFFONT**fonts; +static SWF swf; +static int fontnum = 0; +static SWFFONT**fonts; void textcallback(void*self, int*glyphs, int*ypos, int nr, int fontid, int fontsize, int startx, int starty, RGBA*color) { @@ -415,10 +415,24 @@ void textcallback(void*self, int*glyphs, int*ypos, int nr, int fontid, int fonts printf("\n"); } -void handleText(TAG*tag) +void handleText(TAG*tag, char*prefix) { printf("\n"); - swf_ParseDefineText(tag,textcallback, 0); + if(placements) { + swf_SetTagPos(tag, 0); + swf_GetU16(tag); + swf_GetRect(tag, 0); + swf_ResetReadBits(tag); + MATRIX m; + swf_GetMatrix(tag, &m); + printf("%s| Matrix\n",prefix); + printf("%s| %5.3f %5.3f %6.2f\n", prefix, m.sx/65536.0, m.r1/65536.0, m.tx/20.0); + printf("%s| %5.3f %5.3f %6.2f\n", prefix, m.r0/65536.0, m.sy/65536.0, m.ty/20.0); + swf_SetTagPos(tag, 0); + } + if(showtext) { + swf_ParseDefineText(tag,textcallback, 0); + } } void handleDefineSound(TAG*tag) @@ -948,13 +962,64 @@ void handleExportAssets(TAG*tag, char* prefix) } } +static void handleFontAlign1(TAG*tag) +{ + swf_SetTagPos(tag, 0); + U16 id = swf_GetU16(tag); + U8 flags = swf_GetU8(tag); + printf(" for font %04d, ", id); + if((flags&3)==0) printf("thin, "); + else if((flags&3)==1) printf("medium, "); + else if((flags&3)==2) printf("thick, "); + else printf("?, "); + int num=0; + while(tag->pos < tag->len) { + int nr = swf_GetU8(tag); // should be 2 + int t; + if(nr>2) { + printf("*** unsupported multiboxes ***, "); + break; + } + for(t=0;tpos < tag->len) { + printf("%sglyph %d) ", prefix, num++); + int nr = swf_GetU8(tag); // should be 2 + int t; + for(t=0;tid, tag->len, prefix, swf_TagGetName(tag)); } - if(swf_isDefiningTag(tag)) { - U16 id = swf_GetDefineID(tag); - printf(" defines id %04d", id); - if(idtab[id]) - dumperror("Id %04d is defined more than once.", id); - idtab[id] = 1; - } - else if(swf_isPseudoDefiningTag(tag)) { - U16 id = swf_GetDefineID(tag); - printf(" adds information to id %04d", id); - if(!idtab[id]) - dumperror("Id %04d is not yet defined.\n", id); - } - else if(tag->id == ST_PLACEOBJECT) { + if(tag->id == ST_PLACEOBJECT) { printf(" places id %04d at depth %04x", swf_GetPlaceID(tag), swf_GetDepth(tag)); if(swf_GetName(tag)) printf(" name \"%s\"",swf_GetName(tag)); @@ -1220,10 +1272,12 @@ int main (int argc,char ** argv) else if(tag->id == ST_FILEATTRIBUTES) { swf_SetTagPos(tag, 0); U32 flags = swf_GetU32(tag); - if(flags&1) printf(" usenetwork"); - if(flags&8) printf(" as3"); - if(flags&16) printf(" symbolclass"); - if(flags&~(1|8|16)) + if(flags&FILEATTRIBUTE_USENETWORK) printf(" usenetwork"); + if(flags&FILEATTRIBUTE_AS3) printf(" as3"); + if(flags&FILEATTRIBUTE_SYMBOLCLASS) printf(" symbolclass"); + if(flags&FILEATTRIBUTE_USEHARDWAREGPU) printf(" hardware-gpu"); + if(flags&FILEATTRIBUTE_USEACCELERATEDBLIT) printf(" accelerated-blit"); + if(flags&~(1|8|16|32|64)) printf(" flags=%02x", flags); } else if(tag->id == ST_DOABC) { @@ -1263,7 +1317,7 @@ int main (int argc,char ** argv) } } else if(tag->id == ST_FRAMELABEL) { - int l = strlen(tag->data); + int l = strlen((char*)tag->data); printf(" \"%s\"", tag->data); if((l+1) < tag->len) { printf(" has %d extra bytes", tag->len-1-l); @@ -1275,8 +1329,8 @@ int main (int argc,char ** argv) dumperror("Frame %d has more than one label", issprite?spriteframe:mainframe); } - if(issprite) spriteframelabel = tag->data; - else framelabel = tag->data; + if(issprite) spriteframelabel = (char*)tag->data; + else framelabel = (char*)tag->data; } else if(tag->id == ST_SHOWFRAME) { char*label = issprite?spriteframelabel:framelabel; @@ -1313,6 +1367,9 @@ int main (int argc,char ** argv) printf(" %s", swf_GetString(tag)); } } + else if(tag->id == ST_DEFINEFONTALIGNZONES) { + handleFontAlign1(tag); + } else if(tag->id == ST_CSMTEXTSETTINGS) { U16 id = swf_GetU16(tag); U8 flags = swf_GetU8(tag); @@ -1333,6 +1390,19 @@ int main (int argc,char ** argv) printf("s=%.2f,t=%.2f)", thickness, sharpness); swf_GetU8(tag); } + else if(swf_isDefiningTag(tag)) { + U16 id = swf_GetDefineID(tag); + printf(" defines id %04d", id); + if(idtab[id]) + dumperror("Id %04d is defined more than once.", id); + idtab[id] = 1; + } + else if(swf_isPseudoDefiningTag(tag)) { + U16 id = swf_GetDefineID(tag); + printf(" adds information to id %04d", id); + if(!idtab[id]) + dumperror("Id %04d is not yet defined.\n", id); + } if(tag->id == ST_DEFINEBITSLOSSLESS || tag->id == ST_DEFINEBITSLOSSLESS2) { @@ -1361,10 +1431,7 @@ int main (int argc,char ** argv) printf(" URL: %s\n", s); } else if(tag->id == ST_DEFINETEXT || tag->id == ST_DEFINETEXT2) { - if(showtext) - handleText(tag); - else - printf("\n"); + handleText(tag, myprefix); } else if(tag->id == ST_DEFINESCALINGGRID) { U16 id = swf_GetU16(tag); @@ -1450,6 +1517,9 @@ int main (int argc,char ** argv) else if(tag->id == ST_PLACEOBJECT2 || tag->id == ST_PLACEOBJECT3) { handlePlaceObject23(tag, myprefix); } + else if(tag->id == ST_DEFINEFONTALIGNZONES) { + handleFontAlign2(tag, myprefix); + } else if(tag->id == ST_DEFINEFONTNAME) { swf_SetTagPos(tag, 0); swf_GetU16(tag); //id