X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fswfcombine.c;h=76bb1ccea4bf4aeb66d339a344c64e491da087b4;hb=ac8c6f00fbaa94b3136457caf1a24d8f4f0c12cc;hp=b4dbfb9cfc08417595d780b1910357b72c86226a;hpb=d0c255a3b63de4982e15f1c1c169ebdb08d4163c;p=swftools.git

diff --git a/src/swfcombine.c b/src/swfcombine.c
index b4dbfb9..76bb1cc 100644
--- a/src/swfcombine.c
+++ b/src/swfcombine.c
@@ -293,6 +293,20 @@ void args_callback_usage(char *name)
     printf("\n");
 }
 
+void removeCommonTags(SWF * swf)
+{
+    TAG*tag = swf->firstTag;
+    while(tag) {
+	if(tag->id == ST_SCENEDESCRIPTION ||
+	   tag->id == ST_FILEATTRIBUTES ||
+	   tag->id == ST_REFLEX) {
+	    tag = swf_DeleteTag(swf, tag);
+	} else {
+	    tag = tag->next;
+	}
+    }
+}
+
 static void makestackmaster(SWF*swf)
 {
     TAG*tag;
@@ -300,6 +314,7 @@ static void makestackmaster(SWF*swf)
     SRECT box;
     int fileversion = config.zlib?6:3;
     int frameRate = 256;
+    U32 fileAttributes = 0;
     RGBA rgb;
     rgb.r=rgb.b=rgb.g=0;
     memset(&box, 0, sizeof(box));
@@ -317,6 +332,9 @@ static void makestackmaster(SWF*swf)
 	}
 	close(fi);
 	swf_RemoveJPEGTables(&head);
+        fileAttributes |= head.fileAttributes;
+	removeCommonTags(&head);
+
 	msg("<verbose> File %s has bounding box %d:%d:%d:%d\n",
 		slave_filename[t], 
 		head.movieSize.xmin, head.movieSize.ymin,
@@ -356,6 +374,7 @@ static void makestackmaster(SWF*swf)
     swf->fileVersion = fileversion;
     swf->movieSize = box;
     swf->frameRate = frameRate;
+    swf->fileAttributes = fileAttributes;
 
     swf->firstTag = swf_InsertTag(0, ST_SETBACKGROUNDCOLOR);
     tag = swf->firstTag;
@@ -443,7 +462,7 @@ void jpeg_assert(SWF*master, SWF*slave)
 	{
 	    // ok, both have jpegtables, but they're identical.
 	    // delete one and don't throw an error
-	    swf_DeleteTag(spos);
+	    swf_DeleteTag(slave, spos);
 	    spos = 0;
 	}
     }
@@ -931,9 +950,7 @@ void catcombine(SWF*master, char*slave_name, SWF*slave, SWF*newswf)
     }
     tag = swf_InsertTag(tag, ST_END);
 
-    tag = newswf->firstTag;
-    newswf->firstTag = newswf->firstTag->next; //remove temporary tag
-    swf_DeleteTag(tag);
+    swf_DeleteTag(newswf, tag);
 }
 
 void normalcombine(SWF*master, char*slave_name, SWF*slave, SWF*newswf)
@@ -1045,9 +1062,7 @@ void normalcombine(SWF*master, char*slave_name, SWF*slave, SWF*newswf)
 		FLAGS_WRITEDEFINES|FLAGS_WRITENONDEFINES|   FLAGS_WRITESPRITE	);
     }
 
-    tag = newswf->firstTag;
-    newswf->firstTag = newswf->firstTag->next; //remove temporary tag
-    swf_DeleteTag(tag);
+    swf_DeleteTag(newswf, newswf->firstTag);
 }
 
 void combine(SWF*master, char*slave_name, SWF*slave, SWF*newswf)
@@ -1058,6 +1073,8 @@ void combine(SWF*master, char*slave_name, SWF*slave, SWF*newswf)
 
     if(!master->fileVersion && slave)
 	master->fileVersion = slave->fileVersion;
+        
+    master->fileAttributes |= slave->fileAttributes;
 
     swf_FoldAll(master);
     swf_FoldAll(slave);
@@ -1186,6 +1203,7 @@ int main(int argn, char *argv[])
 	    exit(1);
 	}
 	swf_RemoveJPEGTables(&master);
+	removeCommonTags(&master);
 	msg("<debug> Read %d bytes from masterfile\n", ret);
 	close(fi);
     }
@@ -1254,6 +1272,7 @@ int main(int argn, char *argv[])
 		msg("<debug> Read %d bytes from slavefile\n", ret);
 		close(fi);
 		swf_RemoveJPEGTables(&slave);
+		removeCommonTags(&slave);
 	    }
 	    else
 	    {