X-Git-Url: http://git.asbjorn.biz/?p=swftools.git;a=blobdiff_plain;f=src%2Fswfcombine.c;h=cc3bffca661bf6b9ef671eecf4b15becfdc759ec;hp=1fad28d75af08a3622de4d5accbb7b64d155bf10;hb=26af26a251a58f33b295a0ae36ebd27ec167dc88;hpb=c9b3f16f20729e72788ff3351dad975c96f6bba1

diff --git a/src/swfcombine.c b/src/swfcombine.c
index 1fad28d..cc3bffc 100644
--- a/src/swfcombine.c
+++ b/src/swfcombine.c
@@ -3,14 +3,25 @@
 
    Part of the swftools package.
    
-   Copyright (c) 2001 Matthias Kramm <kramm@quiss.org> 
-
-   This file is distributed under the GPL, see file COPYING for details */
+   Copyright (c) 2001,2002,2003 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 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 <stdlib.h>
 #include <stdio.h>
 #include <string.h>
-#include <zlib.h>
 #include "../lib/rfxswf.h"
 #include "../lib/args.h"
 #include "../lib/log.h"
@@ -30,15 +41,19 @@ struct config_t
    char merge;
    char isframe;
    int loglevel;
-   int movex;
-   int movey;
    int sizex;
    char hassizex;
    int sizey;
    char hassizey;
    int framerate;
+   int movex;
+   int movey;
    float scalex;
    float scaley;
+   int mastermovex;
+   int mastermovey;
+   float masterscalex;
+   float masterscaley;
 };
 struct config_t config;
 
@@ -209,8 +224,14 @@ int args_callback_command(char*name, char*val) {
     if(!master_filename) {
 	master_filename = filename;
 	master_name = myname;
+	config.mastermovex = config.movex;
+	config.mastermovey = config.movey;
+	config.masterscalex = config.scalex;
+	config.masterscaley = config.scaley;
+	config.movex = config.movey = 0;
+	config.scalex = config.scaley = 1.0;
     } else {		 
-	logf("<verbose> slave entity %s (named \"%s\")\n", filename, myname);
+	msg("<verbose> slave entity %s (named \"%s\")\n", filename, myname);
 
 	slave_filename[numslaves] = filename;
 	slave_name[numslaves] = myname;
@@ -234,7 +255,7 @@ void args_callback_usage(char*name)
     printf("OR:    %s [-rXYov] --cat [-xysf] [(name1|#id1)=]slavefile1 .. [-xysf] [(nameN|#idN)=]slavefileN\n", name);
     printf("OR:    %s [-rXYomlcv] --dummy [-xys] [file]\n", name);
     printf("\n");
-    printf("-o outputfile       --output    explicitly specify output file. (otherwise, output.swf will be used\n");
+    printf("-o outputfile       --output    explicitly specify output file. (otherwise, output.swf will be used)\n");
     printf("-t                  --stack     place each slave in a seperate frame (no master movie)\n");
     printf("-T                  --stack1    place each slave in the first frame (no master movie)\n");
     printf("-m                  --merge     Don't store the slaves in Sprites/MovieClips\n");
@@ -259,23 +280,38 @@ static void makestackmaster(SWF*swf)
     int t;
     SRECT box;
     int fileversion = 1;
+    int frameRate = 256;
+    RGBA rgb;
+    rgb.r=rgb.b=rgb.g=0;
     memset(&box, 0, sizeof(box));
 
     /* scan all slaves for bounding box */
-    for(t=0;t<numslaves;t++)
+    for(t=numslaves-1;t>=0;t--)
     {
 	SWF head;
 	int ret;
-	int fi=open(slave_filename[t],O_RDONLY);
+	int fi=open(slave_filename[t],O_RDONLY|O_BINARY);
+	TAG*tag;
 	if(fi<0 || swf_ReadSWF(fi, &head)<0) {
-	    logf("<fatal> Couldn't open/read %s.", slave_filename[t]);
+	    msg("<fatal> Couldn't open/read %s.", slave_filename[t]);
 	    exit(1);
 	}
 	close(fi);
-	logf("<verbose> File %s has bounding box %d:%d:%d:%d\n",
+	msg("<verbose> File %s has bounding box %d:%d:%d:%d\n",
 		slave_filename[t], 
 		head.movieSize.xmin, head.movieSize.ymin,
 		head.movieSize.xmax, head.movieSize.ymax);
+
+	tag = head.firstTag;
+	while(tag) {
+	    if(tag->id == ST_SETBACKGROUNDCOLOR && tag->len>=3) {
+		rgb.r = tag->data[0];
+		rgb.g = tag->data[1];
+		rgb.b = tag->data[2];
+	    }
+	    tag=tag->next;
+	}
+	frameRate = head.frameRate;
 	if(head.fileVersion > fileversion)
 	    fileversion = head.fileVersion;
 	if(!t)
@@ -290,19 +326,20 @@ static void makestackmaster(SWF*swf)
 	    if(head.movieSize.ymax > box.ymax)
 		box.ymax = head.movieSize.ymax;
 	}
-	logf("<verbose> New master bounding box is %d:%d:%d:%d\n",
+	msg("<verbose> New master bounding box is %d:%d:%d:%d\n",
 		box.xmin, box.ymin,
 		box.xmax, box.ymax);
 	swf_FreeTags(&head);
     }
 
     memset(swf, 0, sizeof(SWF));
+    swf->fileVersion = fileversion;
+    swf->movieSize = box;
+    swf->frameRate = frameRate;
 
-    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);
-    swf_SetU8(tag, 0);
+    swf_SetRGB(tag, &rgb);
     
     for(t=0;t<numslaves;t++)
     {
@@ -328,6 +365,7 @@ static void makestackmaster(SWF*swf)
 	}
     }
     tag = swf_InsertTag(tag, ST_END);
+    msg("<verbose> temporary SWF created");
 }
 
 static char* slavename = 0;
@@ -343,7 +381,7 @@ static char masterbitmap[65536];
 int get_free_id(char*bitmap)
 {
     int t;
-    for(t=1;t<65537;t++)
+    for(t=1;t<65536;t++)
 	if(!bitmap[t]) {
 	    bitmap[t] = 1;
 	    return t;
@@ -351,27 +389,64 @@ int get_free_id(char*bitmap)
     return -1;
 }
 
-void jpeg_assert()
+void jpeg_assert(SWF*master, SWF*slave)
 {
+    /* TODO: if there's a jpegtable found, store it
+       and handle it together with the flash file
+       headers */
+
+    /* check that master and slave don't have both
+       jpegtables (which would be fatal) */
+    int pos;
+    TAG *mpos=0, *spos=0;
+    TAG *mtag,*stag;
+    pos = 0;
+    mtag = master->firstTag;
+    stag = slave->firstTag;
+    while(mtag)
+    {
+	if(mtag->id  == ST_JPEGTABLES)
+	    mpos = mtag;
+	mtag = mtag->next;
+    }
+    while(stag)
+    {
+	if(stag->id == ST_JPEGTABLES)
+	    spos = stag;
+	stag = stag->next;
+    }
+    if(mpos && spos)
+    {
+	if(spos->len == mpos->len &&
+	!memcmp(spos->data, mpos->data, mpos->len))
+	{
+	    // ok, both have jpegtables, but they're identical.
+	    // delete one and don't throw an error
+	    swf_DeleteTag(spos);
+	    spos = 0;
+	}
+    }
+    if(spos && mpos) {
+	msg("<error> Master and slave have incompatible JPEGTABLES.");
+    }
 }
 
 TAG* write_sprite_defines(TAG*tag, SWF*sprite)
 {
-    int pos = 0;
     TAG*rtag = sprite->firstTag;
-    while(rtag) {
+    while(rtag && rtag->id!=ST_END) {
 	if(!swf_isAllowedSpriteTag(rtag)) {
-	    logf("<debug> processing sprite tag %02x", tag->id);
+	    msg("<debug> processing sprite tag %02x", tag->id);
 	    if(swf_isDefiningTag(rtag))
 	    {
-		logf("<debug> [sprite defs] write tag %02x (%d bytes in body)", 
+		msg("<debug> [sprite defs] write tag %02x (%d bytes in body)", 
 			tag->id, tag->len);
 		tag = swf_InsertTag(tag, rtag->id);
 		swf_SetBlock(tag, rtag->data, rtag->len);
 	    }
 	    else if(swf_isPseudoDefiningTag(rtag))
 	    {
-		logf("<debug> [sprite defs] write tag %02x (%d bytes in body)", 
+		msg("<debug> [sprite defs] write tag %02x (%d bytes in body)", 
 			tag->id, tag->len);
 		tag = swf_InsertTag(tag, rtag->id);
 		swf_SetBlock(tag, rtag->data, rtag->len);
@@ -387,25 +462,25 @@ TAG* write_sprite_defines(TAG*tag, SWF*sprite)
 			   swf_SetBlock(tag, rtag->data, rtag->len);
 		       break;
 		    case ST_EXPORTASSETS:
-		       logf("<debug> deliberately ignoring EXPORTASSETS tag");
+		       msg("<debug> deliberately ignoring EXPORTASSETS tag");
 		       break;
 		    case ST_ENABLEDEBUGGER:
-		       logf("<debug> deliberately ignoring ENABLEDEBUGGER tag");
+		       msg("<debug> deliberately ignoring ENABLEDEBUGGER tag");
 		       break;
 		    case ST_SETBACKGROUNDCOLOR:
-		       logf("<debug> deliberately ignoring BACKGROUNDCOLOR tag");
+		       msg("<debug> deliberately ignoring BACKGROUNDCOLOR tag");
 		       break;
 		    case 40:
 		    case 49:
 		    case 51:
-		       logf("<notice> found tag %d. This is a Generator template, isn't it?", tag->id);
+		       msg("<notice> found tag %d. This is a Generator template, isn't it?", tag->id);
 		       break;
 		    default:
-		       logf("<notice> funny tag: %d is neither defining nor sprite", tag->id);
+		       msg("<notice> funny tag: %d is neither defining nor sprite", tag->id);
 		}
 	    }
 	}
-	pos++;
+	rtag = rtag->next;
     }
     return tag;
 }
@@ -423,19 +498,23 @@ void changedepth(TAG*tag, int add)
 	PUT16(&tag->data[0],GET16(&tag->data[0])+add);
 }
 
-void matrix_adjust(MATRIX*m)
+void matrix_adjust(MATRIX*m, int movex, int movey, float scalex, float scaley, int scalepos)
 {
-    m->sx = (int)(m->sx*config.scalex);
-    m->sy = (int)(m->sy*config.scaley);
-    m->r0 = (int)(m->r0*config.scalex);
-    m->r1 = (int)(m->r1*config.scaley);
-    m->tx += config.movex;
-    m->ty += config.movey;
+    m->sx = (int)(m->sx*scalex);
+    m->sy = (int)(m->sy*scaley);
+    m->r1 = (int)(m->r1*scalex);
+    m->r0 = (int)(m->r0*scaley);
+    if(scalepos) {
+	m->tx *= scalex;
+	m->ty *= scaley;
+    }
+    m->tx += movex;
+    m->ty += movey;
 }
 
-void write_changepos(TAG*output, TAG*tag)
+void write_changepos(TAG*output, TAG*tag, int movex, int movey, float scalex, float scaley, int scalepos)
 {
-    if(config.movex || config.movey || config.scalex != 1 || config.scaley != 1)
+    if(movex || movey || scalex != 1 || scaley != 1)
     {
 	switch(tag->id)
 	{
@@ -443,6 +522,8 @@ void write_changepos(TAG*output, TAG*tag)
 		MATRIX m;
 		U8 flags;
 		swf_GetMatrix(0, &m);
+		tag->pos = 0;
+		tag->readBit = 0;
 
 		flags = swf_GetU8(tag);
 		swf_SetU8(output, flags|4);
@@ -451,11 +532,16 @@ void write_changepos(TAG*output, TAG*tag)
 		if(flags&2) {
 		    swf_SetU16(output, swf_GetU16(tag)); //id
 		}
+		// flags & 4
 		if(flags&4) {
 		    swf_GetMatrix(tag, &m);
-		    matrix_adjust(&m);
-		    swf_SetMatrix(tag, &m);
+		} else {
+		    swf_GetMatrix(0, &m);
 		}
+		matrix_adjust(&m, movex, movey, scalex, scaley, scalepos);
+		swf_SetMatrix(output, &m);
+
+		//swf_ResetReadBits(tag);
 		swf_SetBlock(output, &tag->data[tag->pos], tag->len - tag->pos);
 		break;
 	    }
@@ -463,9 +549,12 @@ void write_changepos(TAG*output, TAG*tag)
 		MATRIX m;
 		swf_SetU16(output, swf_GetU16(tag)); //id
 		swf_SetU16(output, swf_GetU16(tag)); //depth
+		
 		swf_GetMatrix(tag, &m);
-		matrix_adjust(&m);
-		swf_SetMatrix(tag, &m);
+		matrix_adjust(&m, movex, movey, scalex, scaley, scalepos);
+		swf_SetMatrix(output, &m);
+		
+		//swf_ResetReadBits(tag);
 		swf_SetBlock(output, &tag->data[tag->pos], tag->len - tag->pos);
 		break;
 	    }
@@ -481,7 +570,6 @@ void write_changepos(TAG*output, TAG*tag)
 
 TAG* write_sprite(TAG*tag, SWF*sprite, int spriteid, int replaceddefine)
 {
-    int pos = 0;
     TAG* definespritetag;
     TAG* rtag;
     int tmp;
@@ -489,11 +577,10 @@ TAG* write_sprite(TAG*tag, SWF*sprite, int spriteid, int replaceddefine)
     definespritetag = tag = swf_InsertTag(tag, ST_DEFINESPRITE);
     swf_SetU16(tag, spriteid);
     swf_SetU16(tag, sprite->frameCount);
-    logf ("<notice> sprite id is %d", spriteid);
+    msg ("<notice> sprite id is %d", spriteid);
 
-    // write slave(2) (body)
     tmp = sprite->frameCount;
-    logf("<debug> %d frames to go",tmp);
+    msg("<debug> %d frames to go",tmp);
 
     if(config.clip) {
 	tag = swf_InsertTag(tag, ST_PLACEOBJECT2);
@@ -506,29 +593,31 @@ TAG* write_sprite(TAG*tag, SWF*sprite, int spriteid, int replaceddefine)
     if(config.overlay && !config.isframe) {
 	tag = swf_InsertTag(tag, ST_PLACEOBJECT2);
 	swf_SetU8(tag, 2); //flags: character
-	swf_SetU16(tag, 0); //depth
+	swf_SetU16(tag, 1); //depth
 	swf_SetU16(tag, replaceddefine); //id
     }
 
     rtag = sprite->firstTag;
-    while(rtag)
+    while(rtag && rtag->id!=ST_END)
     {
 	if (swf_isAllowedSpriteTag(rtag)) {
 
-	    changedepth(rtag, +1);
-	    logf("<debug> [sprite main] write tag %02x (%d bytes in body)", 
+	    msg("<debug> [sprite main] write tag %02x (%d bytes in body)", 
 		    rtag->id, rtag->len);
-
 	    tag = swf_InsertTag(tag, rtag->id);
-	    write_changepos(rtag, tag);
+	    write_changepos(tag, rtag, config.movex, config.movey, config.scalex, config.scaley, 0);
+	
+	    changedepth(tag, +2);
 
 	    if(tag->id == ST_SHOWFRAME)
 	    {
 		tmp--;
-		logf("<debug> %d frames to go",tmp);
+		msg("<debug> %d frames to go",tmp);
 	    }
 	}
+	rtag = rtag->next;
     }
+    tag = swf_InsertTag(tag, ST_END);
     return tag;
 }
 
@@ -549,11 +638,11 @@ TAG* write_master(TAG*tag, SWF*master, SWF*slave, int spriteid, int replaceddefi
     TAG* rtag = master->firstTag;
     TAG* stag = slave->firstTag;
 
-    while(rtag)
+    while(rtag && rtag->id!=ST_END)
     {
 	if(rtag->id == ST_SHOWFRAME && outputslave)
 	{
-	    while(stag) {
+	    while(stag && stag->id!=ST_END) {
 		if(stag->id == ST_SHOWFRAME) {
 		    stag = stag->next;
 		    sframe++;
@@ -573,18 +662,18 @@ TAG* write_master(TAG*tag, SWF*master, SWF*slave, int spriteid, int replaceddefi
 
 	if(swf_isDefiningTag(rtag) && (flags&FLAGS_WRITEDEFINES))
 	{
-	    logf("<debug> [master] write tag %02x (%d bytes in body)", 
+	    msg("<debug> [master] write tag %02x (%d bytes in body)", 
 		    rtag->id, rtag->len);
 	    if(swf_GetDefineID(rtag) == spriteid && !config.isframe)
 	    {
 		if(config.overlay)
 		{
-		    PUT16(rtag->data, replaceddefine);
 		    tag = swf_InsertTag(tag, rtag->id);
 		    swf_SetBlock(tag, rtag->data, rtag->len);
+		    swf_SetDefineID(tag, replaceddefine);
 		} else {
 		    /* don't write this tag */
-		    logf("<verbose> replacing tag %d id %d with sprite", rtag->id
+		    msg("<verbose> replacing tag %d id %d with sprite", rtag->id
 			    ,spriteid);
 		}
 
@@ -613,7 +702,7 @@ TAG* write_master(TAG*tag, SWF*master, SWF*slave, int spriteid, int replaceddefi
 		int id = get_free_id(masterbitmap);
 		int depth = 0;
 		if(config.clip) {
-		    logf("<fatal> Can't combine --clip and --frame");
+		    msg("<fatal> Can't combine --clip and --frame");
 		}
 		
 		tag = write_sprite_defines(tag, slave);
@@ -636,7 +725,6 @@ TAG* write_master(TAG*tag, SWF*master, SWF*slave, int spriteid, int replaceddefi
 		    if(frame == slaveframe && !config.overlay)
 			dontwrite = 1;
 		case ST_REMOVEOBJECT:
-//		case ST_REMOVEOBJECT2:
 		    /* place/removetags for the object we replaced
 		       should be discarded, too, as the object to insert 
 		       isn't a sprite 
@@ -645,19 +733,21 @@ TAG* write_master(TAG*tag, SWF*master, SWF*slave, int spriteid, int replaceddefi
 			    !config.isframe && config.merge)
 			dontwrite = 1;
 		break;
+		case ST_REMOVEOBJECT2:
+		break;
 	    }
 	    if(!dontwrite) {
-		logf("<debug> [master] write tag %02x (%d bytes in body)", 
+		msg("<debug> [master] write tag %02x (%d bytes in body)", 
 			rtag->id, rtag->len);
 		tag = swf_InsertTag(tag, rtag->id);
-		swf_SetBlock(tag, rtag->data, rtag->len);
+		write_changepos(tag, rtag, config.mastermovex, config.mastermovey, config.masterscalex, config.masterscaley, 1);
 	    }
 	}
-	tag = tag->next;
+	rtag = rtag->next;
     }
    
     if(outputslave) 
-    while(stag)
+    while(stag && stag->id!=ST_END)
     {
 	    if(tag_ok_for_slave(stag->id)) {
 		tag = swf_InsertTag(tag, stag->id);
@@ -668,24 +758,126 @@ TAG* write_master(TAG*tag, SWF*master, SWF*slave, int spriteid, int replaceddefi
     if(!slavewritten && config.isframe && (flags&(FLAGS_WRITESLAVE|FLAGS_WRITESPRITE)))
     {
 	if(slaveframe>=0)
-	    logf("<warning> Frame %d doesn't exist in file. No substitution will occur",
+	    msg("<warning> Frame %d doesn't exist in file. No substitution will occur",
 		    slaveframe);
 	else
-	    logf("<warning> Frame \"%s\" doesn't exist in file. No substitution will occur",
+	    msg("<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)
 {
-    printf("--cat not implemented yet. Please use the swfcombine from swftools 0.3.1 or 0.2.3.\n");
-    exit(1);
+    char* depths;
+    int t;
+    TAG*tag;
+    TAG*mtag,*stag;
+    if(config.isframe) {
+	msg("<fatal> Can't combine --cat and --frame");
+	exit(1);
+    }
+   
+    tag = master->firstTag;
+    while(tag)
+    {
+	if(swf_isDefiningTag(tag)) {
+	    int defineid = swf_GetDefineID(tag);
+	    msg("<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));
+    adjustheader(newswf);
+
+    tag = newswf->firstTag = swf_InsertTag(0, ST_REFLEX); // to be removed later
+
+    depths = malloc(65536);
+    if(!depths) {
+	msg("<fatal> Couldn't allocate %d bytes of memory", 65536);
+	return;
+    }
+    memset(depths, 0, 65536);
+    mtag = master->firstTag;
+    while(mtag && mtag->id!=ST_END)
+    {
+	int num=1;
+	U16 depth;
+	msg("<debug> [master] write tag %02x (%d bytes in body)", 
+		mtag->id, mtag->len);
+	switch(mtag->id) {
+	    case ST_PLACEOBJECT2:
+		num++;
+	    case ST_PLACEOBJECT: {
+	       depth = swf_GetDepth(mtag);
+	       depths[depth] = 1;
+	    }
+	    break;
+	    case ST_REMOVEOBJECT: {
+	       depth = swf_GetDepth(mtag);
+	       depths[depth] = 0;
+	    }
+	    break;
+	    case ST_REMOVEOBJECT2: {
+	       depth = swf_GetDepth(mtag);
+	       depths[depth] = 0;
+	    }
+	    break;
+	}
+	tag = swf_InsertTag(tag, mtag->id);
+	swf_SetBlock(tag, mtag->data, mtag->len);
+
+	mtag = mtag->next;
+    }
+
+    for(t=0;t<65536;t++) 
+    if(depths[t])
+    {
+	char data[16];
+	int len;
+	tag = swf_InsertTag(tag, ST_REMOVEOBJECT2);
+	swf_SetU16(tag, t);
+    }
+    free(depths);
+
+    stag = slave->firstTag;
+    while(stag && stag->id!=ST_END)
+    {
+	msg("<debug> [slave] write tag %02x (%d bytes in body)", 
+		stag->id, stag->len);
+	tag = swf_InsertTag(tag, stag->id);
+	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)
 {
-    int pos=0;
     int spriteid = -1;
     int replaceddefine = -1;
     int frame = 0;
@@ -693,56 +885,60 @@ void normalcombine(SWF*master, char*slave_name, SWF*slave, SWF*newswf)
     TAG * tag = master->firstTag;
     
     // set the idtab
-    pos = 0;
-
     while(tag)
     {
 	if(swf_isDefiningTag(tag)) {
 	    int defineid = swf_GetDefineID(tag);
-	    logf("<debug> tagid %02x defines object %d", tag, defineid);
+	    msg("<debug> tagid %02x defines object %d", tag->id, defineid);
 	    masterbitmap[defineid] = 1;
+	    if (!slavename && defineid==slaveid) {
+		if(defineid>=0) {
+		  spriteid = defineid;
+		  msg("<notice> Slave file attached to object %d.", defineid);
+		}
+	    }
 	} else if(tag->id == ST_PLACEOBJECT2) {
 	    char * name = swf_GetName(tag);
 	    int id = swf_GetPlaceID(tag);
 
 	    if(name)
-	      logf("<verbose> tagid %02x places object %d named \"%s\"", tag, id, name);
+	      msg("<verbose> tagid %02x places object %d named \"%s\"", tag->id, id, name);
 	    else
-	      logf("<verbose> tagid %02x places object %d (no name)", tag, id);
+	      msg("<verbose> tagid %02x places object %d (no name)", tag->id, id);
 
-	    if ((name && slavename && !strcmp(name,slavename)) || 
-		(!slavename && id==slaveid)) {
+	    if (name && slavename && !strcmp(name,slavename)) {
 		if(id>=0) {
 		  spriteid = id;
-		  logf("<notice> Slave file attached to object %d.", id);
+		  msg("<notice> Slave file attached to named object %s (%d).", name, id);
 		}
 	    }
 	} else if(tag->id == ST_SHOWFRAME) {
 	    if(slaveframe>=0 && frame==slaveframe) {
-		logf("<notice> Slave file attached to frame %d.", frame);
+		msg("<notice> Slave file attached to frame %d.", frame);
 	    }
 	    frame++;
 	} else if(tag->id == ST_FRAMELABEL) {
 	    char * name = tag->data;
 	    if(name && slavename && config.isframe && !strcmp(name, slavename)) {
 		slaveframe = frame;
-		logf("<notice> Slave file attached to frame %d (%s).", frame, name);
+		msg("<notice> Slave file attached to frame %d (%s).", frame, name);
 	    }
 	}
+	tag = tag->next;
     };
 
     if (spriteid<0 && !config.isframe) {
 	if(slavename) {
 	    if(strcmp(slavename,"!!dummy!!"))
-		logf("<warning> Didn't find anything named %s in file. No substitutions will occur.", slavename);
+		msg("<warning> Didn't find anything named %s in file. No substitutions will occur.", slavename);
 	}
 	else
-	    logf("<warning> Didn't find id %d in file. No substitutions will occur.", slaveid);
+	    msg("<warning> Didn't find id %d in file. No substitutions will occur.", slaveid);
 	spriteid = get_free_id(masterbitmap);
     }
 
     swf_Relocate (slave, masterbitmap);
-    jpeg_assert();
+    jpeg_assert(slave, master);
     
     if (config.overlay)
 	replaceddefine = get_free_id(masterbitmap);
@@ -750,11 +946,13 @@ 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) {
-	    logf("<fatal> Can't combine --antistream and --merge");
+	    msg("<fatal> Can't combine --antistream and --merge");
 	}
 	tag = write_sprite_defines(tag, slave);
 	tag = write_sprite(tag, slave, spriteid, replaceddefine);
@@ -763,11 +961,15 @@ void normalcombine(SWF*master, char*slave_name, SWF*slave, SWF*newswf)
     } else {
 	if (config.merge)
 	    tag = write_master(tag, master, slave, spriteid, replaceddefine, 
-		FLAGS_WRITEDEFINES|FLAGS_WRITENONDEFINES|FLAGS_WRITESLAVE);
+		FLAGS_WRITEDEFINES|FLAGS_WRITENONDEFINES|   FLAGS_WRITESLAVE	);
 	else
 	    tag = write_master(tag, master, slave, spriteid, replaceddefine, 
-		FLAGS_WRITEDEFINES|FLAGS_WRITENONDEFINES|FLAGS_WRITESPRITE);
+		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)
@@ -804,16 +1006,20 @@ void combine(SWF*master, char*slave_name, SWF*slave, SWF*newswf)
 	    slaveid = -1;
 	} else {
 	/* if id wasn't given as either #number or number,
-	   the name is a frame label. BTW: The user wouldn't have
+	   the name is a frame label. BTW: The user wouldn't necessarily have
 	   needed to supply the -f option in this case */
 	}
     }
 
-    logf("<debug> move x (%d)", config.movex);
-    logf("<debug> move y (%d)", config.movey);
-    logf("<debug> scale x (%f)", config.scalex);
-    logf("<debug> scale y (%f)", config.scaley);
-    logf("<debug> is frame (%d)", config.isframe);
+    msg("<debug> move x (%d)", config.movex);
+    msg("<debug> move y (%d)", config.movey);
+    msg("<debug> scale x (%f)", config.scalex);
+    msg("<debug> scale y (%f)", config.scaley);
+    msg("<debug> master move x (%d)", config.mastermovex);
+    msg("<debug> master move y (%d)", config.mastermovey);
+    msg("<debug> master scale x (%f)", config.masterscalex);
+    msg("<debug> master scale y (%f)", config.masterscaley);
+    msg("<debug> is frame (%d)", config.isframe);
     
     memset(masterbitmap, 0, sizeof(masterbitmap));
 
@@ -844,6 +1050,10 @@ int main(int argn, char *argv[])
     config.scaley = 1.0;
     config.sizex = 0;
     config.sizey = 0;
+    config.masterscalex = 1.0;
+    config.masterscaley = 1.0;
+    config.mastermovex = 0;
+    config.mastermovey = 0;
     config.hassizex = 0;
     config.hassizey = 0;
     config.framerate = 0;
@@ -856,42 +1066,42 @@ int main(int argn, char *argv[])
     initLog(0,-1,0,0,-1,config.loglevel);
 
     if(config.merge && config.cat) {
-	logf("<error> Can't combine --cat and --merge");
+	msg("<error> Can't combine --cat and --merge");
 	exit(1);
     }
 
     if(config.stack) {
 	if(config.overlay) {
-	    logf("<error> Can't combine -l and -t");
+	    msg("<error> Can't combine -l and -t");
 	    exit(1);
 	}
 	if(config.clip) {
-	    logf("<error> Can't combine -c and -t");
+	    msg("<error> Can't combine -c and -t");
 	    exit(1);
 	}
-	logf("<verbose> (stacking) %d files found\n", numslaves);
+	msg("<verbose> (stacking) %d files found\n", numslaves);
 
 	makestackmaster(&master);
     }
     else {
 	int ret;
-	logf("<verbose> master entity %s (named \"%s\")\n", master_filename, master_name);
-	fi = open(master_filename, O_RDONLY);
+	msg("<verbose> master entity %s (named \"%s\")\n", master_filename, master_name);
+	fi = open(master_filename, O_RDONLY|O_BINARY);
 	if(fi<0) {
-	    logf("<fatal> Failed to open %s\n", master_filename);
+	    msg("<fatal> Failed to open %s\n", master_filename);
 	    exit(1);
 	}
 	ret = swf_ReadSWF(fi, &master);
 	if(ret<0) {
-	    logf("<fatal> Failed to read from %s\n", master_filename);
+	    msg("<fatal> Failed to read from %s\n", master_filename);
 	    exit(1);
 	}
-	logf("<debug> Read %d bytes from masterfile\n", ret);
+	msg("<debug> Read %d bytes from masterfile\n", ret);
 	close(fi);
     }
 
     for(t=0;t<numslaves;t++) {
-	    logf("<verbose> slave entity(%d) %s (%s \"%s\")\n", t+1, slave_filename[t], 
+	    msg("<verbose> slave entity(%d) %s (%s \"%s\")\n", t+1, slave_filename[t], 
 		    slave_isframe[t]?"frame":"object", slave_name[t]);
     }
 
@@ -899,7 +1109,7 @@ int main(int argn, char *argv[])
     {
 	if(numslaves)
 	{
-	    logf("<error> --dummy (-d) implies there are zero slave objects. You supplied %d.", numslaves);
+	    msg("<error> --dummy (-d) implies there are zero slave objects. You supplied %d.", numslaves);
 	    exit(1);
 	}
 	numslaves = 1;
@@ -923,9 +1133,9 @@ int main(int argn, char *argv[])
 	if (!numslaves)
 	{
 	    if(config.cat)
-		logf("<error> You must have at least two objects.");
+		msg("<error> You must have at least two objects.");
 	    else
-		logf("<error> You must have at least one slave entity.");
+		msg("<error> You must have at least one slave entity.");
 	    return 0;
 	}
 	for(t = 0; t < numslaves; t++)
@@ -936,22 +1146,22 @@ int main(int argn, char *argv[])
 	    config.scaley = slave_scaley[t];
 	    config.isframe = slave_isframe[t];
 
-	    logf("<notice> Combine [%s]%s and [%s]%s", master_name, master_filename,
+	    msg("<notice> Combine [%s]%s and [%s]%s", master_name, master_filename,
 		    slave_name[t], slave_filename[t]);
 	    if(!config.dummy)
 	    {
 		int ret;
-		fi = open(slave_filename[t], O_RDONLY);
+		fi = open(slave_filename[t], O_RDONLY|O_BINARY);
 		if(!fi) {
-		    logf("<fatal> Failed to open %s\n", slave_filename[t]);
+		    msg("<fatal> Failed to open %s\n", slave_filename[t]);
 		    exit(1);
 		}
 		ret = swf_ReadSWF(fi, &slave);
 		if(ret<0) {
-		    logf("<fatal> Failed to read from %s\n", slave_filename[t]);
+		    msg("<fatal> Failed to read from %s\n", slave_filename[t]);
 		    exit(1);
 		}
-		logf("<debug> Read %d bytes from slavefile\n", ret);
+		msg("<debug> Read %d bytes from slavefile\n", ret);
 		close(fi);
 	    }
 	    else
@@ -968,11 +1178,14 @@ int main(int argn, char *argv[])
 	}
     }
 
-    fi = open(outputname, O_RDWR|O_TRUNC|O_CREAT);
+    fi = open(outputname, O_BINARY|O_RDWR|O_TRUNC|O_CREAT, 0777);
+
     if(config.zlib)
 	swf_WriteSWC(fi, &newswf);
-    else
+    else {
+	newswf.compressed = 0;
 	swf_WriteSWF(fi, &newswf);
+    }
     close(fi);
     return 0;
 }