added support for mode 6 images.

[swftools.git] / src / swfcombine.c

diff --git a/src/swfcombine.c b/src/swfcombine.c
index 1f10f65..9dedbf8 100644 (file)
--- a/src/swfcombine.c
+++ b/src/swfcombine.c
@@ -234,7 +234,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");
@@ -506,7 +506,11 @@ void write_changepos(TAG*output, TAG*tag)
                    swf_SetU16(output, swf_GetU16(tag)); //id
                }
                // flags & 4
-               swf_GetMatrix(tag, &m);
+               if(flags&4) {
+                   swf_GetMatrix(tag, &m);
+               } else {
+                   swf_GetMatrix(0, &m);
+               }
                matrix_adjust(&m);
                swf_SetMatrix(output, &m);
 
@@ -562,7 +566,7 @@ 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
     }
 
@@ -575,8 +579,8 @@ TAG* write_sprite(TAG*tag, SWF*sprite, int spriteid, int replaceddefine)
                    rtag->id, rtag->len);
            tag = swf_InsertTag(tag, rtag->id);
            write_changepos(tag, rtag);
-         
-           changedepth(tag, +1);
+       
+           changedepth(tag, +2);
 
            if(tag->id == ST_SHOWFRAME)
            {