X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fswfcombine.c;h=25698eedcb8a902c07061f80dd77839b88faeeb1;hb=918a290574399a88456bbc70d7064c04ab8f6819;hp=16589b1662ee4c0dbea90106224fd68084a133e5;hpb=8081c317843e68de1cce8dee38055916fada47a1;p=swftools.git

diff --git a/src/swfcombine.c b/src/swfcombine.c
index 16589b1..25698ee 100644
--- a/src/swfcombine.c
+++ b/src/swfcombine.c
@@ -285,7 +285,7 @@ void args_callback_usage(char *name)
     printf("-f , --frame                   The following identifier is a frame or framelabel, not an id or objectname\n");
     printf("-x , --movex <xpos>            x Adjust position of slave by <xpos> pixels\n");
     printf("-y , --movey <ypos>            y Adjust position of slave by <ypos> pixels\n");
-    printf("-s , --scale <scale>           Adjust size of slave by <scale> percent (e.g. 100% = original size)\n");
+    printf("-s , --scale <scale>           Adjust size of slave by <scale> percent (e.g. 100%% = original size)\n");
     printf("-r , --rate <fps>              Set movie framerate to <fps> (frames/sec)\n");
     printf("-X , --width <width>           Force movie bbox width to <width> (default: use master width (not with -t))\n");
     printf("-Y , --height <height>          Force movie bbox height to <height> (default: use master height (not with -t))\n");
@@ -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)
@@ -1005,8 +1022,12 @@ void normalcombine(SWF*master, char*slave_name, SWF*slave, SWF*newswf)
 
     if (spriteid<0 && !config.isframe) {
 	if(slavename) {
-	    if(strcmp(slavename,"!!dummy!!"))
+	    if(strcmp(slavename,"!!dummy!!")) {
 		msg("<warning> Didn't find anything named %s in file. No substitutions will occur.", slavename);
+		if(!strcmp(slavename, "swf")) {
+		    msg("<warning> (If you were trying to combine rfxview with a document, try replacing 'swf' with 'viewport'.");
+		}
+	    }
 	}
 	else
 	    msg("<warning> Didn't find id %d in file. No substitutions will occur.", slaveid);
@@ -1045,9 +1066,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 +1077,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 +1207,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 +1276,7 @@ int main(int argn, char *argv[])
 		msg("<debug> Read %d bytes from slavefile\n", ret);
 		close(fi);
 		swf_RemoveJPEGTables(&slave);
+		removeCommonTags(&slave);
 	    }
 	    else
 	    {
@@ -1283,9 +1306,10 @@ int main(int argn, char *argv[])
     if(config.zlib) {
 	if(newswf.fileVersion < 6)
 	    newswf.fileVersion = 6;
-	swf_WriteSWC(fi, &newswf);
+        newswf.compressed = 1;
+	swf_WriteSWF(fi, &newswf);
     } else {
-	newswf.compressed = 0;
+	newswf.compressed = -1; // don't compress
 	swf_WriteSWF(fi, &newswf);
     }
     close(fi);