X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fcombine.c;h=9530bb73949d12bff2666114ed873f3891704d85;hb=bae7e68ac03535a3cfeb4ad88f97b9be71f37565;hp=10b8efc54ad1454a40eb95128b8d101ba3288950;hpb=3cbef51ff4a0c87044fa9b0f5387db9585c16272;p=swftools.git

diff --git a/src/combine.c b/src/combine.c
index 10b8efc..9530bb7 100644
--- a/src/combine.c
+++ b/src/combine.c
@@ -157,8 +157,15 @@ void write_sprite_defines(struct writer_t*w)
 			 * Anyway we can't throw it out, so we just pass it
 			 * through.
 			 */
+			writer_write(w, tag->fulldata, tag->fulllength);
 			break;
 		    }
+		 case TAGID_JPEGTABLES:
+			/* according to the flash specs, there may only 
+			   be one JPEGTABLES tag per swf. This is maybe
+			   a big FIXME */
+			writer_write(w, tag->fulldata, tag->fulllength);
+		    break;
 		 case TAGID_EXPORTASSETS:
 		    logf("<debug> deliberately ignoring EXPORTASSETS tag");
 		    break;
@@ -358,6 +365,9 @@ uchar * combine(uchar*masterdata, int masterlength, char*_slavename, uchar*slave
 	logf("<notice> the master file is flash (swf) format\n");
 	master_flash = 1;
     }
+    else
+	logf("<notice> the master file is not flash (swf) format!\n");
+
     if(slavedata[2] == 'S' &&
        slavedata[1] == 'W' &&
        slavedata[0] == 'F')
@@ -365,6 +375,8 @@ uchar * combine(uchar*masterdata, int masterlength, char*_slavename, uchar*slave
 	logf("<notice> the slave file is flash (swf) format\n");
 	slave_flash = 1;
     }
+    else
+	logf("<notice> the slave file is not flash (swf) format!\n");
 
     if(master_flash && slave_flash)
     {