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 missing GPL headers
[swftools.git]
/
src
/
swfdump.c
diff --git
a/src/swfdump.c
b/src/swfdump.c
index
6c944b6
..
d65e625
100644
(file)
--- a/
src/swfdump.c
+++ b/
src/swfdump.c
@@
-73,8
+73,8
@@
static struct options_t options[] = {
{"s", "shapes"},
{"F", "fonts"},
{"p", "placements"},
{"s", "shapes"},
{"F", "fonts"},
{"p", "placements"},
-{"b", "bbox"},
{"B", "buttons"},
{"B", "buttons"},
+{"b", "bbox"},
{"X", "width"},
{"Y", "height"},
{"r", "rate"},
{"X", "width"},
{"Y", "height"},
{"r", "rate"},
@@
-185,6
+185,7
@@
void args_callback_usage(char *name)
printf("-s , --shapes Show shape coordinates/styles\n");
printf("-F , --fonts Show font information\n");
printf("-p , --placements Show placement information\n");
printf("-s , --shapes Show shape coordinates/styles\n");
printf("-F , --fonts Show font information\n");
printf("-p , --placements Show placement information\n");
+ printf("-B , --buttons Show button information\n");
printf("-b , --bbox Print tag's bounding boxes\n");
printf("-X , --width Prints out a string of the form \"-X width\".\n");
printf("-Y , --height Prints out a string of the form \"-Y height\".\n");
printf("-b , --bbox Print tag's bounding boxes\n");
printf("-X , --width Prints out a string of the form \"-X width\".\n");
printf("-Y , --height Prints out a string of the form \"-Y height\".\n");
@@
-342,6
+343,35
@@
void dumpFont(TAG*tag, char*prefix)
swf_Shape2Free(shape);
free(shape);
}
swf_Shape2Free(shape);
free(shape);
}
+
+ /*
+ not part of the file
+
+ printf("%sencoding table:", prefix, prefix);
+ char filled0=0, lastfilled=0;
+ for(t=0;t<font->maxascii;t++) {
+ if((t&15)==0) {
+ printf("\n%s%08x ", prefix, t);
+ int s;
+ if(!filled0 && t) {
+ for(s=t;s<font->maxascii;s++) {
+ if(font->ascii2glyph[s]>=0) break;
+ }
+ if(s>t+32) {
+ printf("*");
+ t = ((s-16)&~15)-1;
+ continue;
+ }
+ }
+ filled0 = 0;
+ for(s=t;s<t+16 && s<font->maxascii;s++) {
+ if(font->ascii2glyph[s]>=0) filled0=1;
+ }
+ }
+ printf("%4d ", font->ascii2glyph[t]);
+ }
+ printf("\n");*/
+
swf_FontFree(font);
}
swf_FontFree(font);
}
@@
-924,7
+954,7
@@
void dumperror(const char* format, ...)
va_list arglist;
va_start(arglist, format);
va_list arglist;
va_start(arglist, format);
- vsprintf(buf, format, arglist);
+ vsnprintf(buf, sizeof(buf)-1, format, arglist);
va_end(arglist);
if(!html && !xy)
va_end(arglist);
if(!html && !xy)
@@
-984,8
+1014,8
@@
int main (int argc,char ** argv)
char header[3];
read(f, header, 3);
char compressed = (header[0]=='C');
char header[3];
read(f, header, 3);
char compressed = (header[0]=='C');
- char isflash = header[0]=='F' && header[1] == 'W' && header[2] == 'S' ||
- header[0]=='C' && header[1] == 'W' && header[2] == 'S';
+ char isflash = (header[0]=='F' && header[1] == 'W' && header[2] == 'S') ||
+ (header[0]=='C' && header[1] == 'W' && header[2] == 'S');
close(f);
int fl=strlen(filename);
close(f);
int fl=strlen(filename);
@@
-1046,7
+1076,7
@@
int main (int argc,char ** argv)
if(html)
{
char*fileversions[] = {"","1,0,0,0", "2,0,0,0","3,0,0,0","4,0,0,0",
if(html)
{
char*fileversions[] = {"","1,0,0,0", "2,0,0,0","3,0,0,0","4,0,0,0",
- "5,0,0,0","6,0,23,0","7,0,0,0","8,0,0,0","9,0,0,0","10,0,0,0"};
+ "5,0,0,0","6,0,23,0","7,0,0,0","8,0,0,0","9,0,0,0","10,0,0,0", "11,0,0,0", "12,0,0,0"};
if(swf.fileVersion>10) {
fprintf(stderr, "Fileversion>10\n");
exit(1);
if(swf.fileVersion>10) {
fprintf(stderr, "Fileversion>10\n");
exit(1);
@@
-1071,9
+1101,11
@@
int main (int argc,char ** argv)
" <PARAM NAME=\"PLAY\" VALUE=\"true\">\n"
" <PARAM NAME=\"LOOP\" VALUE=\"true\">\n"
" <PARAM NAME=\"QUALITY\" VALUE=\"high\">\n"
" <PARAM NAME=\"PLAY\" VALUE=\"true\">\n"
" <PARAM NAME=\"LOOP\" VALUE=\"true\">\n"
" <PARAM NAME=\"QUALITY\" VALUE=\"high\">\n"
+ " <PARAM NAME=\"ALLOWSCRIPTACCESS\" VALUE=\"always\">\n"
" <EMBED SRC=\"%s\" WIDTH=\"%d\" HEIGHT=\"%d\"\n" //bgcolor=#ffffff?
" PLAY=\"true\" ALIGN=\"\" LOOP=\"true\" QUALITY=\"high\"\n"
" TYPE=\"application/x-shockwave-flash\"\n"
" <EMBED SRC=\"%s\" WIDTH=\"%d\" HEIGHT=\"%d\"\n" //bgcolor=#ffffff?
" PLAY=\"true\" ALIGN=\"\" LOOP=\"true\" QUALITY=\"high\"\n"
" TYPE=\"application/x-shockwave-flash\"\n"
+ " ALLOWSCRIPTACCESS=\"always\"\n"
" PLUGINSPAGE=\"http://www.macromedia.com/go/getflashplayer\">\n"
" </EMBED>\n"
"</OBJECT>\n", xsize, ysize, fileversions[swf.fileVersion],
" PLUGINSPAGE=\"http://www.macromedia.com/go/getflashplayer\">\n"
" </EMBED>\n"
"</OBJECT>\n", xsize, ysize, fileversions[swf.fileVersion],
@@
-1198,7
+1230,7
@@
int main (int argc,char ** argv)
swf_SetTagPos(tag, 0);
U32 flags = swf_GetU32(tag);
char*s = swf_GetString(tag);
swf_SetTagPos(tag, 0);
U32 flags = swf_GetU32(tag);
char*s = swf_GetString(tag);
- if(flags) {
+ if(flags&~1) {
printf(" flags=%08x", flags);
}
if(*s) {
printf(" flags=%08x", flags);
}
if(*s) {