X-Git-Url: http://git.asbjorn.biz/?p=swftools.git;a=blobdiff_plain;f=src%2Fswfextract.c;h=e385f1f1accd12941ffdc4ae53111c1580677e4a;hp=3550731eb00e1ba0618073250867008ec9990f4d;hb=2391d7ae5d8a145a250a8b80ab8c93ba74eba030;hpb=83f7c791cb0bed79c8aa943d669a6111a0635421

diff --git a/src/swfextract.c b/src/swfextract.c
index 3550731..e385f1f 100644
--- a/src/swfextract.c
+++ b/src/swfextract.c
@@ -42,6 +42,7 @@ char* extractjpegids = 0;
 char* extractfontids = 0;
 char* extractpngids = 0;
 char* extractsoundids = 0;
+char* extractbinaryids = 0;
 char extractmp3 = 0;
 
 char* extractname = 0;
@@ -68,6 +69,7 @@ struct options_t options[] =
  {"f","frame"},
  {"F","font"},
  {"V","version"},
+ {"b","binary"},
  {0,0}
 };
 
@@ -137,6 +139,15 @@ int args_callback_option(char*name,char*val)
 	extractsoundids = val;
 	return 1;
     } 
+    else if(!strcmp(name, "b")) {
+	if(extractbinaryids) {
+	    fprintf(stderr, "Only one --binary argument is allowed. (Try to use a range, e.g. -s 1,2,3)\n");
+	    exit(1);
+	}
+	numextracts++;
+	extractbinaryids = val;
+	return 1;
+    } 
 #ifdef _ZLIB_INCLUDED_
     else if(!strcmp(name, "p")) {
 	if(extractpngids) {
@@ -483,9 +494,12 @@ 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;
     }
+    if (t== 6 && (tag->id == ST_DEFINEBINARY)) {
+        show = 1;
+    }
     return show;
 }
 
@@ -495,8 +509,8 @@ void listObjects(SWF*swf)
     char first;
     int t;
     int frame = 0;
-    char*names[] = {"Shape", "MovieClip", "JPEG", "PNG", "Sound", "Font"};
-    char*options[] = {"-i", "-i", "-j", "-p", "-s", "-F"};
+    char*names[] = {"Shape", "MovieClip", "JPEG", "PNG", "Sound", "Font", "Binary"};
+    char*options[] = {"-i", "-i", "-j", "-p", "-s", "-F","-b"};
     int mp3=0;
     printf("Objects in file %s:\n",filename);
     swf_FoldAll(swf);
@@ -586,8 +600,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);
@@ -689,7 +701,7 @@ void handlejpeg(TAG*tag)
     }
     else {
 	int id = GET16(tag->data);
-	fprintf(stderr, "Object %d is not a JPEG picture!\n",id, jpegtables);
+	fprintf(stderr, "Object %d is not a JPEG picture!\n", id);
 	exit(1);
     }
 }
@@ -831,7 +843,7 @@ void handlelossless(TAG*tag)
     }
     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));
 
@@ -1025,6 +1037,30 @@ void handledefinesound(TAG*tag)
     fclose(fi);
 }
 
+void handlebinary(TAG*tag) {
+    FILE *fout = NULL;
+    char buf[100];
+    char *filename = buf;
+    int len = tag->memsize;
+    int dx = 6; // offset to binary data
+    if (tag->id!=ST_DEFINEBINARY) {
+        fprintf(stderr, "Object %d is not a binary entity!\n",
+                        GET16(tag->data));
+        return;
+    }
+    sprintf(buf, "binary%d.bin", GET16(tag->data));
+    if(numextracts==1) {
+	filename = destfilename;
+	if(!strcmp(filename,"output.swf")) {
+	    sprintf(buf, "output.bin");
+	    filename = buf;
+	}
+    }
+    fout = fopen(filename, "wb");
+    fwrite(tag->data+dx,len-dx,1,fout);
+    fclose(fout);
+}
+
 int main (int argc,char ** argv)
 { 
     TAG*tag;
@@ -1038,7 +1074,7 @@ int main (int argc,char ** argv)
     processargs(argc, argv);
 
     if(!extractframes && !extractids && ! extractname && !extractjpegids && !extractpngids
-	&& !extractmp3 && !extractsoundids && !extractfontids)
+	&& !extractmp3 && !extractsoundids && !extractfontids && !extractbinaryids)
 	listavailable = 1;
 
     if(!originalplaceobjects && movetozero) {
@@ -1143,6 +1179,9 @@ int main (int argc,char ** argv)
 	    if(extractsoundids && is_in_range(id, extractsoundids)) {
 		handledefinesound(tag);
 	    }
+	    if(extractbinaryids && is_in_range(id, extractbinaryids)) {
+		handlebinary(tag);
+	    }
 #ifdef _ZLIB_INCLUDED_
 	    if(extractpngids && is_in_range(id, extractpngids)) {
 		handlelossless(tag);