X-Git-Url: http://git.asbjorn.biz/?p=swftools.git;a=blobdiff_plain;f=src%2Fswfextract.c;h=f66dd83ffae1660a6d5ef4d5f88a46455ff78872;hp=a4a2dede7c6cd70113f73567aef750f86d6f7266;hb=33d53306bf9f5faa13bf6e1071d2acf35e1e1c30;hpb=8948fb16775bb8334db34e2a99ae41c28cc212c9

diff --git a/src/swfextract.c b/src/swfextract.c
index a4a2ded..f66dd83 100644
--- a/src/swfextract.c
+++ b/src/swfextract.c
@@ -48,6 +48,7 @@ char* extractname = 0;
 
 char hollow = 0;
 char originalplaceobjects = 0;
+char movetozero = 0;
 
 int numextracts = 0;
 
@@ -60,6 +61,7 @@ struct options_t options[] =
  {"j","jpegs"},
  {"p","pngs"},
  {"P","placeobject"},
+ {"0","movetozero"},
  {"m","mp3"},
  {"s","sound"},
  {"n","name"},
@@ -112,6 +114,7 @@ int args_callback_option(char*name,char*val)
 	    fprintf(stderr, "Only one --jpegs argument is allowed. (Try to use a range, e.g. -j 1,2,3)\n");
 	    exit(1);
 	}
+	/* TODO: count number of IDs in val range */
 	numextracts++;
 	extractjpegids = val;
 	return 1;
@@ -154,6 +157,10 @@ int args_callback_option(char*name,char*val)
 	originalplaceobjects = 1;
 	return 0;
     }
+    else if(!strcmp(name, "0")) {
+	movetozero = 1;
+	return 0;
+    }
     else if(!strcmp(name, "w")) {
 	hollow = 1;
 	return 0;
@@ -254,6 +261,18 @@ void enumerateIDs(TAG*tag, void(*callback)(void*))
 	callback(&tag->data[ptr[t]]);
 }
 
+void moveToZero(TAG*tag)
+{
+    if(!swf_isPlaceTag(tag))
+	return;
+    SWFPLACEOBJECT obj;
+    swf_GetPlaceObject(tag, &obj);
+    obj.matrix.tx = 0;
+    obj.matrix.ty = 0;
+    swf_ResetTag(tag, tag->id);
+    swf_SetPlaceObject(tag, &obj);
+}
+
 void extractTag(SWF*swf, char*filename)
 {
     SWF newswf;
@@ -271,6 +290,12 @@ void extractTag(SWF*swf, char*filename)
     newswf.fileVersion    = swf->fileVersion;
     newswf.frameRate      = swf->frameRate;
     newswf.movieSize	  = swf->movieSize;
+    if(movetozero && originalplaceobjects) {
+	newswf.movieSize.xmax = swf->movieSize.xmax - swf->movieSize.xmin;
+	newswf.movieSize.ymax = swf->movieSize.ymax - swf->movieSize.ymin;
+	newswf.movieSize.xmin = 0;
+	newswf.movieSize.ymin = 0;
+    }
 		
     newswf.firstTag = swf_InsertTag(NULL,ST_SETBACKGROUNDCOLOR);
     desttag = newswf.firstTag;
@@ -316,6 +341,8 @@ void extractTag(SWF*swf, char*filename)
 	}
 	if(srctag->id == ST_DEFINESPRITE)
 	    sprite = 1;
+        if(srctag->id == ST_JPEGTABLES)
+            copy = 1;
 	if(swf_isDefiningTag(srctag)) {
 	    int id = swf_GetDefineID(srctag);
 	    if(used[id])  {
@@ -325,7 +352,7 @@ void extractTag(SWF*swf, char*filename)
 		swf_ExpandRect2(&objectbbox, &b);
 	    }
 	} else 
-	if (((((srctag->id == ST_PLACEOBJECT || srctag->id == ST_PLACEOBJECT2) && originalplaceobjects)
+	if ((((swf_isPlaceTag(srctag) && originalplaceobjects)
 	      || srctag->id == ST_STARTSOUND) && (used[swf_GetPlaceID(srctag)]&4) ) ||
 	      (swf_isPseudoDefiningTag(srctag) && used[swf_GetDefineID(srctag)]) ||
 	      (tagused[tagnum])) 
@@ -345,6 +372,9 @@ void extractTag(SWF*swf, char*filename)
 	    desttag->len = desttag->memsize = srctag->len;
 	    desttag->data = malloc(srctag->len);
 	    memcpy(desttag->data, srctag->data, srctag->len);
+	    if(movetozero && swf_isPlaceTag(desttag)) {
+		moveToZero(desttag);
+	    }
 	    if(reset)
 	        copy = 0;
 	}
@@ -360,17 +390,21 @@ void extractTag(SWF*swf, char*filename)
             TAG* objtag = 0;
             SRECT bbox;
             memset(&bbox, 0, sizeof(SRECT));
-	    for(t=0;t<65536;t++) {
-	        if(is_in_range(t, extractids)) {
-                    id = t;
-                    number++;
-                }
-            }
-            if(number>=2)
+	    if(extractids) {
+		for(t=0;t<65536;t++) {
+		    if(is_in_range(t, extractids)) {
+			id = t;
+			number++;
+		    }
+		}
+	    }
+            if(number>=2) {
 		printf("warning! You should use the -P when extracting multiple objects\n");
+	    }
+
             if(number == 1) {
                 /* if there is only one object, we will scale it.
-                   So let's figure out it's bounding box */
+                   So let's figure out its bounding box */
                 TAG*tag = swf->firstTag;
                 while(tag) {
                     if(swf_isDefiningTag(tag) && tag->id != ST_DEFINESPRITE) {
@@ -380,10 +414,15 @@ void extractTag(SWF*swf, char*filename)
                     }
                     tag = tag->next;
                 }
-            }
+		newswf.movieSize.xmin = 0;
+		newswf.movieSize.ymin = 0;
+		newswf.movieSize.xmax = 512*20;
+		newswf.movieSize.ymax = 512*20;
+            } else {
+		if((objectbbox.xmin|objectbbox.ymin|objectbbox.xmax|objectbbox.ymax)!=0)
+		    newswf.movieSize = objectbbox;
+	    }
 
-	    if((objectbbox.xmin|objectbbox.ymin|objectbbox.xmax|objectbbox.ymax)!=0)
-		newswf.movieSize = objectbbox;
 	    if(extractname_id>=0) {
 		desttag = swf_InsertTag(desttag, ST_PLACEOBJECT2);
 		swf_ObjectPlace(desttag, extractname_id, extractname_id, 0,0,extractname);
@@ -403,7 +442,7 @@ void extractTag(SWF*swf, char*filename)
                                 m.sx = (512*20*65536)/max;
                                 m.sy = (512*20*65536)/max;
                             }
-                            newswf.movieSize = swf_TurnRect(newswf.movieSize, &m);
+                            //newswf.movieSize = swf_TurnRect(newswf.movieSize, &m);
                         }
 			swf_ObjectPlace(desttag, t, t, &m,0,0);
 		    }
@@ -554,14 +593,16 @@ void handlefont(SWF*swf, TAG*tag)
     swf_FontFree(f);
 }
 
-U8*jpegtables = 0;
-int jpegtablessize;
+static char has_jpegtables=0;
+static U8*jpegtables = 0;
+static int jpegtablessize = 0;
 
 void handlejpegtables(TAG*tag)
 {
     if(tag->id == ST_JPEGTABLES) {
 	jpegtables = tag->data;
 	jpegtablessize = tag->len;
+	has_jpegtables = 1;
     }
 }
 
@@ -579,7 +620,7 @@ int findjpegboundary(U8*data, int len)
 {
     int t;
     int pos=-1;
-    for(t=0;t<len;t++) {
+    for(t=0;t<len-4;t++) {
 	if(data[t  ]==0xff &&
 	   data[t+1]==0xd9 &&
 	   data[t+2]==0xff &&
@@ -606,10 +647,14 @@ void handlejpeg(TAG*tag)
     /* swf jpeg images have two streams, which both start with ff d8 and
        end with ff d9. The following code handles sorting the middle
        <ff d9 ff d8> bytes out, so that one stream remains */
-    if(tag->id == ST_DEFINEBITSJPEG && tag->len>2 && jpegtables) {
+    if(tag->id == ST_DEFINEBITSJPEG && tag->len>2 && has_jpegtables) {
 	fi = save_fopen(filename, "wb");
-	fwrite(jpegtables, 1, jpegtablessize-2, fi); //don't write end tag (ff,d8)
-	fwrite(&tag->data[2+2], tag->len-2-2, 1, fi); //don't write start tag (ff,d9)
+	if(jpegtablessize>=2) {
+	    fwrite(jpegtables, 1, jpegtablessize-2, fi); //don't write end tag (ff,d8)
+	    fwrite(&tag->data[2+2], tag->len-2-2, 1, fi); //don't write start tag (ff,d9)
+	} else {
+	    fwrite(tag->data+2, tag->len-2, 1, fi);
+	}
 	fclose(fi);
     }
     else if(tag->id == ST_DEFINEBITSJPEG2 && tag->len>2) {
@@ -640,7 +685,7 @@ void handlejpeg(TAG*tag)
     }
     else {
 	int id = GET16(tag->data);
-	fprintf(stderr, "Object %d is not a JPEG picture!\n",id);
+	fprintf(stderr, "Object %d is not a JPEG picture!\n",id, jpegtables);
 	exit(1);
     }
 }
@@ -718,11 +763,11 @@ void handlelossless(TAG*tag)
     U8 bpp = 1;
     U8 format;
     U8 tmp;
-    U8* data=0;
+    Bytef* data=0;
     U8* data2=0;
     U8* data3=0;
-    U32 datalen;
-    U32 datalen2;
+    uLongf datalen;
+    uLongf datalen2;
     U32 datalen3;
     U8 head[] = {137,80,78,71,13,10,26,10};
     int cols;
@@ -830,12 +875,21 @@ void handlelossless(TAG*tag)
 	     png_write_byte(fi,palette[t].b);
 	 }
 	png_end_chunk(fi);
+
+	if(alpha) {
+	    /* write alpha palette */
+	    png_start_chunk(fi, "tRNS", 256);
+	    for(t=0;t<256;t++) {
+		png_write_byte(fi,palette[t].a);
+	    }
+	    png_end_chunk(fi);
+	}
     }
     {
 	int pos2 = 0;
 	int x,y;
 	int srcwidth = width * (bpp/8);
-	datalen3 = width*height*4;
+	datalen3 = (width*4+5)*height;
 	data3 = (U8*)malloc(datalen3);
 	for(y=0;y<height;y++)
 	{
@@ -886,7 +940,7 @@ void handlelossless(TAG*tag)
 }
 #endif
 
-FILE*mp3file;
+static FILE*mp3file=0;
 void handlesoundstream(TAG*tag)
 {
     char*filename = "output.mp3";
@@ -983,6 +1037,11 @@ int main (int argc,char ** argv)
 	&& !extractmp3 && !extractsoundids && !extractfontids)
 	listavailable = 1;
 
+    if(!originalplaceobjects && movetozero) {
+	fprintf(stderr, "Error: -0 (--movetozero) can only be used in conjunction with -P (--placeobject)\n");
+	return 0;
+    }
+
     if(!filename)
     {
         fprintf(stderr, "You must supply a filename.\n");
@@ -1060,8 +1119,9 @@ int main (int argc,char ** argv)
 		handlesoundstream(tag);
 	}
 
-	if(tag->id == ST_JPEGTABLES)
+	if(tag->id == ST_JPEGTABLES) {
 	    handlejpegtables(tag);
+	}
 
 	if(swf_isDefiningTag(tag)) {
 	    int id = swf_GetDefineID(tag);
@@ -1090,13 +1150,15 @@ int main (int argc,char ** argv)
 	    maing = tag->data[1];
 	    mainb = tag->data[2];
 	}
-	else if(tag->id == ST_PLACEOBJECT2) {
+	else if(swf_isPlaceTag(tag) && tag->id != ST_PLACEOBJECT ) {
 	    char*name = swf_GetName(tag);
 	    if(name && extractname && !strcmp(name, extractname)) {
 		int id = swf_GetPlaceID(tag); 
 		used[id] = 5;
 		found = 1;
-		tagused[tagnum] = 1;
+		if(originalplaceobjects) {
+		    tagused[tagnum] = 1;
+		}
 		depths[swf_GetDepth(tag)] = 1;
 		extractname_id = id;
 	    }
@@ -1121,8 +1183,13 @@ int main (int argc,char ** argv)
     if (found)
 	extractTag(&swf, destfilename);
 
-    if(mp3file)
+    if(mp3file) {
 	fclose(mp3file);
+    } else {
+        if(extractmp3) {
+            msg("<error> Didn't find a soundstream in file");
+        }
+    }
 
     swf_FreeTags(&swf);
     return 0;