X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fswfcombine.c;h=f564793c123dc2d9d747177fc371d9f3f17adb6a;hb=4d50e9ccf474061088318da8e7a67789fd488a2a;hp=aae3e51ad35f630a6fe5d00d1a9b625028967ce4;hpb=49d4c54ec9563c28b0cf97add1e8e86a954d3bbc;p=swftools.git

diff --git a/src/swfcombine.c b/src/swfcombine.c
index aae3e51..f564793 100644
--- a/src/swfcombine.c
+++ b/src/swfcombine.c
@@ -1045,16 +1045,19 @@ void combine(SWF*master, char*slave_name, SWF*slave, SWF*newswf)
 
     if(config.isframe)
     {
-	int tmp;
-	if(slavename && slavename[0]!='#' && (sscanf(slavename, "%d", &tmp) ==
-		strlen(slavename))) {
-	/* if the name the slave should replace 
-	   consists only of digits and the -f
-	   option is given, it probably is not
-	   a frame name but a frame number.
-	 */
-	    slaveid = tmp;
-	    slavename = 0;
+	if(slavename && slavename[0]!='#') {
+	    int tmp;
+	    int len;
+	    sscanf(slavename, "%d%n", &tmp, &len);
+	    if(len == strlen(slavename)) {
+	    /* if the name the slave should replace 
+	       consists only of digits and the -f
+	       option is given, it probably is not
+	       a frame name but a frame number.
+	     */
+		slaveid = tmp;
+		slavename = 0;
+	    }
 	}
 
 	if(slaveid>=0) {
@@ -1125,6 +1128,11 @@ int main(int argn, char *argv[])
 	msg("<error> Can't combine --cat and --merge");
 	exit(1);
     }
+    
+    if(config.stack && config.cat) {
+	msg("<error> Can't combine --cat and --stack");
+	exit(1);
+    }
 
     if(config.stack) {
 	if(config.overlay) {
@@ -1234,6 +1242,12 @@ int main(int argn, char *argv[])
 	    combine(&master, slave_name[t], &slave, &newswf);
 	    master = newswf;
 	}
+	if(config.dummy && !config.hassizex && !config.hassizey && !config.mastermovex && !config.mastermovey) {
+	    newswf.movieSize.xmin = newswf.movieSize.xmin*config.masterscalex;
+	    newswf.movieSize.ymin = newswf.movieSize.ymin*config.masterscaley;
+	    newswf.movieSize.xmax = newswf.movieSize.xmax*config.masterscalex;
+	    newswf.movieSize.ymax = newswf.movieSize.ymax*config.masterscaley;
+	}
     }
 
     fi = open(outputname, O_BINARY|O_RDWR|O_TRUNC|O_CREAT, 0777);