X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;ds=sidebyside;f=src%2Fswfextract.c;h=2d6b35766cd4fc360f374aa13a9023c00489cdf7;hb=a61b92b4ac72cd15ee0f3165f2e7a2f5ac00f156;hp=3550731eb00e1ba0618073250867008ec9990f4d;hpb=83f7c791cb0bed79c8aa943d669a6111a0635421;p=swftools.git diff --git a/src/swfextract.c b/src/swfextract.c index 3550731..2d6b357 100644 --- a/src/swfextract.c +++ b/src/swfextract.c @@ -483,7 +483,7 @@ int isOfType(int t, TAG*tag) if(t == 4 && (tag->id == ST_DEFINESOUND)) { show = 1; } - if(t == 5 && (tag->id == ST_DEFINEFONT || tag->id == ST_DEFINEFONT2)) { + if(t == 5 && (tag->id == ST_DEFINEFONT || tag->id == ST_DEFINEFONT2 || tag->id == ST_DEFINEFONT3)) { show = 1; } return show; @@ -586,8 +586,6 @@ void handlefont(SWF*swf, TAG*tag) printf("Couldn't extract font %d\n", id); return; } - if(!f->layout) - swf_FontCreateLayout(f); swf_WriteFont(f, filename); swf_FontFree(f); @@ -831,7 +829,7 @@ void handlelossless(TAG*tag) } msg(" Uncompressed image is %d bytes (%d colormap)", datalen, (3+alpha)*cols); pos = 0; - datalen2 = datalen; + datalen2 = datalen+16; data2 = malloc(datalen2); palette = (RGBA*)malloc(cols*sizeof(RGBA));