X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fswfdump.c;h=272f9af0de2f4b33847ea818e9eb125ce9858452;hb=91d8dfaf9084f1e28bb9bb013e658f627fbf4ec5;hp=1793ba0c09ec5e1e3ff89fb5dee9e87d2f98f832;hpb=57524fc0e25085cd4fe1f63d648133f25977eef1;p=swftools.git

diff --git a/src/swfdump.c b/src/swfdump.c
index 1793ba0..272f9af 100644
--- a/src/swfdump.c
+++ b/src/swfdump.c
@@ -70,6 +70,7 @@ static struct options_t options[] = {
 {"a", "action"},
 {"t", "text"},
 {"s", "shapes"},
+{"F", "fonts"},
 {"p", "placements"},
 {"b", "bbox"},
 {"X", "width"},
@@ -176,6 +177,7 @@ void args_callback_usage(char *name)
     printf("-a , --action                  Disassemble action tags\n");
     printf("-t , --text                    Show text fields (like swfstrings).\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 , --bbox                    Print tag's bounding boxes\n");
     printf("-X , --width                   Prints out a string of the form \"-X width\".\n");
@@ -317,7 +319,7 @@ SWFFONT**fonts;
 void textcallback(void*self, int*glyphs, int*ypos, int nr, int fontid, int fontsize, int startx, int starty, RGBA*color) 
 {
     int font=-1,t;
-    printf("                <%2d glyphs in font %2d, color #%02x%02x%02x%02x> ",nr, fontid, color->r, color->g, color->b, color->a);
+    printf("                <%2d glyphs in font %2d size %d, color #%02x%02x%02x%02x> ",nr, fontid, fontsize, color->r, color->g, color->b, color->a);
     for(t=0;t<fontnum;t++)
     {
 	if(fonts[t]->id == fontid) {
@@ -536,6 +538,15 @@ void dumpFilter(FILTER*filter)
 	FILTER_BLUR*f = (FILTER_BLUR*)filter;
 	printf("blurx: %f blury: %f\n", f->blurx, f->blury);
 	printf("passes: %d\n", f->passes);
+    } if(filter->type == FILTERTYPE_GLOW) {
+	FILTER_GLOW*f = (FILTER_GLOW*)filter;
+	printf("color %02x%02x%02x%02x\n", f->rgba.r,f->rgba.g,f->rgba.b,f->rgba.a);
+	printf("blurx: %f blury: %f strength: %f\n", f->blurx, f->blury, f->strength);
+	printf("passes: %d\n", f->passes);
+	printf("flags: %s%s%s\n", 
+		f->knockout?"knockout ":"",
+		f->composite?"composite ":"",
+		f->innerglow?"innerglow":"");
     } if(filter->type == FILTERTYPE_DROPSHADOW) {
 	FILTER_DROPSHADOW*f = (FILTER_DROPSHADOW*)filter;
 	printf("blurx: %f blury: %f\n", f->blurx, f->blury);
@@ -924,7 +935,6 @@ int main (int argc,char ** argv)
     }
 
     f = open(filename,O_RDONLY|O_BINARY);
-
     if (f<0)
     { 
 	char buffer[256];
@@ -932,6 +942,12 @@ int main (int argc,char ** argv)
         perror(buffer);
         exit(1);
     }
+    char header[3];
+    read(f, header, 3);
+    int compressed = (header[0]=='C');
+    close(f);
+    f = open(filename,O_RDONLY|O_BINARY);
+
     if FAILED(swf_ReadSWF(f,&swf))
     { 
         fprintf(stderr, "%s is not a valid SWF file or contains errors.\n",filename);
@@ -941,13 +957,18 @@ int main (int argc,char ** argv)
 
 #ifdef HAVE_STAT
     fstat(f, &statbuf);
-    if(statbuf.st_size != swf.fileSize && !swf.compressed)
+    if(statbuf.st_size != swf.fileSize && !compressed)
         dumperror("Real Filesize (%d) doesn't match header Filesize (%d)",
                 statbuf.st_size, swf.fileSize);
     filesize = statbuf.st_size;
 #endif
 
     close(f);
+    
+    if(action && swf.fileVersion>=9) {
+        fprintf(stderr, "Actionscript parsing (-a) not yet supported for SWF versions>=9\n");
+	action = 0;
+    }
 
     xsize = (swf.movieSize.xmax-swf.movieSize.xmin)/20;
     ysize = (swf.movieSize.ymax-swf.movieSize.ymin)/20;
@@ -1016,7 +1037,7 @@ int main (int argc,char ** argv)
 	return 0;
     } 
     printf("[HEADER]        File version: %d\n", swf.fileVersion);
-    if(swf.compressed) {
+    if(compressed) {
 	printf("[HEADER]        File is zlib compressed.");
 	if(filesize && swf.fileSize)
 	    printf(" Ratio: %02d%%\n", filesize*100/(swf.fileSize));
@@ -1246,7 +1267,7 @@ int main (int argc,char ** argv)
 	}
 	else if(tag->id == ST_PLACEOBJECT2 || tag->id == ST_PLACEOBJECT3) {
 	}
-	else if(tag->id == ST_NAMECHARACTER) {
+	else if(tag->id == ST_NAMECHARACTER || tag->id==ST_DEFINEFONTNAME) {
 	    swf_GetU16(tag);
 	    printf(" \"%s\"\n", swf_GetString(tag));
 	}
@@ -1281,7 +1302,7 @@ int main (int argc,char ** argv)
 	    if(tag->len)
 		dumperror("End Tag not empty");
         }
-	else if(tag->id == ST_EXPORTASSETS) {
+	else if(tag->id == ST_EXPORTASSETS || tag->id == ST_SYMBOLCLASS) {
 	    handleExportAssets(tag, myprefix);
 	}
         else if(tag->id == ST_DOACTION && action) {
@@ -1310,6 +1331,13 @@ int main (int argc,char ** argv)
 	else if(tag->id == ST_PLACEOBJECT2 || tag->id == ST_PLACEOBJECT3) {
 	    handlePlaceObject23(tag, myprefix);
 	}
+	else if(tag->id == ST_DEFINEFONTNAME) {
+	    swf_SetTagPos(tag, 0);
+	    swf_GetU16(tag); //id
+	    swf_GetString(tag); //name
+	    char* copyright = swf_GetString(tag);
+	    printf("%s%s\n", myprefix, copyright);
+	}
 	else if(tag->id == ST_DEFINESHAPE ||
 		tag->id == ST_DEFINESHAPE2 ||
 		tag->id == ST_DEFINESHAPE3 ||