git.asbjorn.biz
/
swftools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
added --flashtype option to font2swf
[swftools.git]
/
src
/
swfextract.c
diff --git
a/src/swfextract.c
b/src/swfextract.c
index
3550731
..
2d6b357
100644
(file)
--- 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 == 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;
show = 1;
}
return show;
@@
-586,8
+586,6
@@
void handlefont(SWF*swf, TAG*tag)
printf("Couldn't extract font %d\n", id);
return;
}
printf("Couldn't extract font %d\n", id);
return;
}
- if(!f->layout)
- swf_FontCreateLayout(f);
swf_WriteFont(f, filename);
swf_FontFree(f);
swf_WriteFont(f, filename);
swf_FontFree(f);
@@
-831,7
+829,7
@@
void handlelossless(TAG*tag)
}
msg("<verbose> Uncompressed image is %d bytes (%d colormap)", datalen, (3+alpha)*cols);
pos = 0;
}
msg("<verbose> 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));
data2 = malloc(datalen2);
palette = (RGBA*)malloc(cols*sizeof(RGBA));