X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fswfcombine.c;h=ce578af9d89f30fbec84ab86d3c55614140055c8;hb=93e78ef02b9918ccfa86f0e4d446e503cbec1fe1;hp=59975c8de412cd776a4ef072facb04801d340309;hpb=9f6b91af3b87eb487e667e767fc1211f7b3f7096;p=swftools.git

diff --git a/src/swfcombine.c b/src/swfcombine.c
index 59975c8..ce578af 100644
--- a/src/swfcombine.c
+++ b/src/swfcombine.c
@@ -298,7 +298,7 @@ static void makestackmaster(SWF*swf)
 
     memset(swf, 0, sizeof(SWF));
 
-    swf->firstTag = swf_InsertTag(tag, ST_SETBACKGROUNDCOLOR);
+    swf->firstTag = swf_InsertTag(0, ST_SETBACKGROUNDCOLOR);
     tag = swf->firstTag;
     swf_SetU8(tag, 0);
     swf_SetU8(tag, 0);
@@ -328,6 +328,7 @@ static void makestackmaster(SWF*swf)
 	}
     }
     tag = swf_InsertTag(tag, ST_END);
+    logf("<verbose> temporary SWF created");
 }
 
 static char* slavename = 0;
@@ -715,9 +716,24 @@ TAG* write_master(TAG*tag, SWF*master, SWF*slave, int spriteid, int replaceddefi
 	    logf("<warning> Frame \"%s\" doesn't exist in file. No substitution will occur",
 		    slavename);
     }
+    tag = swf_InsertTag(tag, ST_END);
     return tag;
 }
 
+void adjustheader(SWF*swf)
+{
+    if(config.framerate)
+	swf->frameRate = config.framerate;
+    if(config.hassizex) {
+	swf->movieSize.xmax = 
+	swf->movieSize.xmin + config.sizex;
+    }
+    if(config.hassizey) {
+	swf->movieSize.ymax = 
+	swf->movieSize.ymin + config.sizey;
+    }
+}
+
 void catcombine(SWF*master, char*slave_name, SWF*slave, SWF*newswf)
 {
     char* depths;
@@ -737,13 +753,16 @@ void catcombine(SWF*master, char*slave_name, SWF*slave, SWF*newswf)
 	    logf("<debug> tagid %02x defines object %d", tag->id, defineid);
 	    masterbitmap[defineid] = 1;
 	}
+	tag = tag->next;
     }
     
     swf_Relocate(slave, masterbitmap);
     jpeg_assert(master, slave);
     
     memcpy(newswf, master, sizeof(SWF));
-    tag = newswf->firstTag = swf_InsertTag(0, ST_REFLEX);
+    adjustheader(newswf);
+
+    tag = newswf->firstTag = swf_InsertTag(0, ST_REFLEX); // to be removed later
 
     depths = malloc(65536);
     if(!depths) {
@@ -752,7 +771,7 @@ void catcombine(SWF*master, char*slave_name, SWF*slave, SWF*newswf)
     }
     memset(depths, 0, 65536);
     mtag = master->firstTag;
-    while(mtag)
+    while(mtag && mtag->id!=ST_END)
     {
 	int num=1;
 	U16 depth;
@@ -779,6 +798,8 @@ void catcombine(SWF*master, char*slave_name, SWF*slave, SWF*newswf)
 	}
 	tag = swf_InsertTag(tag, mtag->id);
 	swf_SetBlock(tag, mtag->data, mtag->len);
+
+	mtag = mtag->next;
     }
 
     for(t=0;t<65536;t++) 
@@ -792,7 +813,7 @@ void catcombine(SWF*master, char*slave_name, SWF*slave, SWF*newswf)
     free(depths);
 
     stag = slave->firstTag;
-    while(stag)
+    while(stag && stag->id!=ST_END)
     {
 	logf("<debug> [slave] write tag %02x (%d bytes in body)", 
 		stag->id, stag->len);
@@ -800,6 +821,11 @@ void catcombine(SWF*master, char*slave_name, SWF*slave, SWF*newswf)
 	swf_SetBlock(tag, stag->data, stag->len);
 	stag = stag->next;
     }
+    tag = swf_InsertTag(tag, ST_END);
+
+    tag = newswf->firstTag;
+    newswf->firstTag = newswf->firstTag->next; //remove temporary tag
+    swf_DeleteTag(tag);
 }
 
 void normalcombine(SWF*master, char*slave_name, SWF*slave, SWF*newswf)
@@ -867,7 +893,9 @@ void normalcombine(SWF*master, char*slave_name, SWF*slave, SWF*newswf)
     // write file 
 
     memcpy(newswf, master, sizeof(SWF));
-    newswf->firstTag = tag = swf_InsertTag(0, ST_REFLEX);
+    adjustheader(newswf);
+
+    newswf->firstTag = tag = swf_InsertTag(0, ST_REFLEX); // to be removed later
 
     if (config.antistream) {
 	if (config.merge) {
@@ -885,6 +913,10 @@ void normalcombine(SWF*master, char*slave_name, SWF*slave, SWF*newswf)
 	    tag = write_master(tag, master, slave, spriteid, replaceddefine, 
 		FLAGS_WRITEDEFINES|FLAGS_WRITENONDEFINES|FLAGS_WRITESPRITE);
     }
+
+    tag = newswf->firstTag;
+    newswf->firstTag = newswf->firstTag->next; //remove temporary tag
+    swf_DeleteTag(tag);
 }
 
 void combine(SWF*master, char*slave_name, SWF*slave, SWF*newswf)
@@ -1085,7 +1117,7 @@ int main(int argn, char *argv[])
 	}
     }
 
-    fi = open(outputname, O_RDWR|O_TRUNC|O_CREAT);
+    fi = open(outputname, O_RDWR|O_TRUNC|O_CREAT, 0777);
 
     if(config.zlib)
 	swf_WriteSWC(fi, &newswf);