X-Git-Url: http://git.asbjorn.biz/?p=swftools.git;a=blobdiff_plain;f=src%2Fswfextract.c;h=a5f549a8d54bd7a8836d630e460edaa4bd0cf20d;hp=d7cbf100411673990c392eb82ba62869533779c0;hb=6f3e9add89a0157ef6552bc154475b43b371e615;hpb=60dea7f912ca4da6854676ce3c5f70089561423e

diff --git a/src/swfextract.c b/src/swfextract.c
index d7cbf10..a5f549a 100644
--- a/src/swfextract.c
+++ b/src/swfextract.c
@@ -4,8 +4,20 @@
    Part of the swftools package.
    
    Copyright (c) 2001 Matthias Kramm <kramm@quiss.org>
+ 
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
 
-   This file is distributed under the GPL, see file COPYING for details */
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
 #include <unistd.h>
 #include <stdio.h>
@@ -273,7 +285,9 @@ void extractTag(SWF*swf, char*filename)
        changed = 0;
        for(t=0;t<65536;t++) {
 	   if(used[t] && !(used[t]&2)) {
-	     if(tags[t]->id==ST_DEFINESPRITE) {
+	     if(tags[t]==0) {
+		 msg("<warning> ID %d is referenced, but never defined.", t);
+	     } else if(tags[t]->id==ST_DEFINESPRITE) {
 		 TAG*tag = tags[t];
 		 while(tag->id != ST_END)
 		 {
@@ -676,11 +690,11 @@ void handlelossless(TAG*tag)
 //    if(format == 5) cols = swf_GetU32(tag) + 1;
     else cols = 0;
 
-    logf("<verbose> Width %d", width);
-    logf("<verbose> Height %d", height);
-    logf("<verbose> Format %d", format);
-    logf("<verbose> Cols %d", cols);
-    logf("<verbose> Bpp %d", bpp);
+    msg("<verbose> Width %d", width);
+    msg("<verbose> Height %d", height);
+    msg("<verbose> Format %d", format);
+    msg("<verbose> Cols %d", cols);
+    msg("<verbose> Bpp %d", bpp);
 
     datalen = (width*height*bpp/8+cols*8);
     do {
@@ -694,7 +708,7 @@ void handlelossless(TAG*tag)
 	fprintf(stderr, "Zlib error %d (image %d)\n", error, id);
 	return;
     }
-    logf("<verbose> Uncompressed image is %d bytes (%d colormap)", datalen, (3+alpha)*cols);
+    msg("<verbose> Uncompressed image is %d bytes (%d colormap)", datalen, (3+alpha)*cols);
     pos = 0;
     datalen2 = datalen;
     data2 = malloc(datalen2);
@@ -774,7 +788,7 @@ void handlelossless(TAG*tag)
 	fprintf(stderr, "zlib error in pic %d\n", id);
 	return;
     }
-    logf("<verbose> Compressed data is %d bytes", datalen2);
+    msg("<verbose> Compressed data is %d bytes", datalen2);
     png_start_chunk(fi, "IDAT", datalen2);
     png_write_bytes(fi,data2,datalen2);
     png_end_chunk(fi);
@@ -800,18 +814,18 @@ void handlesoundstream(TAG*tag)
 	case ST_SOUNDSTREAMHEAD:
 	    if((tag->data[1]&0x30) == 0x20) { //mp3 compression
 		mp3file = fopen(filename, "wb");
-		logf("<notice> Writing mp3 data to %s",filename);
+		msg("<notice> Writing mp3 data to %s",filename);
 	    }
 	    else
-		logf("<error> Soundstream is not mp3");
+		msg("<error> Soundstream is not mp3");
 	break;
 	case ST_SOUNDSTREAMHEAD2:
 	    if((tag->data[1]&0x30) == 0x20) {//mp3 compression
 		mp3file = fopen(filename, "wb");
-		logf("<notice> Writing mp3 data to %s",filename);
+		msg("<notice> Writing mp3 data to %s",filename);
 	    }
 	    else
-		logf("<error> Soundstream is not mp3 (2)");
+		msg("<error> Soundstream is not mp3 (2)");
 	break;
 	case ST_SOUNDSTREAMBLOCK:
 	    if(mp3file)
@@ -874,7 +888,7 @@ int main (int argc,char ** argv)
     }
     initLog(0,-1,0,0,-1, verbose);
 
-    f = open(filename,O_RDONLY);
+    f = open(filename,O_RDONLY|O_BINARY);
 
     if (f<0)
     {