* added swfrender interface

[swftools.git] / src / swfcombine.c

diff --git a/src/swfcombine.c b/src/swfcombine.c
index 5273fb9..136ac79 100644 (file)
--- a/src/swfcombine.c
+++ b/src/swfcombine.c
@@ -288,7 +288,7 @@ static void makestackmaster(SWF*swf)
     TAG*tag;
     int t;
     SRECT box;
-    int fileversion = 1;
+    int fileversion = config.zlib?6:3;
     int frameRate = 256;
     RGBA rgb;
     rgb.r=rgb.b=rgb.g=0;
@@ -480,13 +480,19 @@ TAG* write_sprite_defines(TAG*tag, SWF*sprite)
                    case ST_SETBACKGROUNDCOLOR:
                       msg("<debug> deliberately ignoring BACKGROUNDCOLOR tag");
                       break;
+                   case ST_SHOWFRAME:
+                      msg("<debug> deliberately ignoring SHOWFRAME tag");
+                      break;
+                   case ST_REFLEX:
+                      msg("<debug> deliberately ignoring REFLEX tag");
+                      break;
                    case 40:
                    case 49:
                    case 51:
-                      msg("<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?", rtag->id);
                       break;
                    default:
-                      msg("<notice> funny tag: %d is neither defining nor sprite", tag->id);
+                      msg("<notice> funny tag: %d is neither defining nor sprite", rtag->id);
                }
            }
        }
@@ -507,8 +513,8 @@ void changedepth(TAG*tag, int add)
        PUT16(&tag->data[0],GET16(&tag->data[0])+add);
     if(tag->id == ST_PLACEOBJECT2) {
        SWFPLACEOBJECT obj;
-       swf_SetTagPos(tag, 0);
        U8 flags;
+       swf_SetTagPos(tag, 0);
        flags = swf_GetU8(tag);
        if(flags&2) swf_GetU16(tag); //id
        if(flags&4) swf_GetMatrix(tag, 0);
@@ -729,7 +735,7 @@ TAG* write_master(TAG*tag, SWF*master, SWF*slave, int spriteid, int replaceddefi
            if((flags&FLAGS_WRITESPRITE) && !slavewritten)
            {
                int id = get_free_id(masterbitmap);
-               int depth = 0;
+               int depth = 65535;
                if(config.clip) {
                    msg("<fatal> Can't combine --clip and --frame");
                }
@@ -1218,9 +1224,11 @@ int main(int argn, char *argv[])
 
     fi = open(outputname, O_BINARY|O_RDWR|O_TRUNC|O_CREAT, 0777);
 
-    if(config.zlib)
+    if(config.zlib) {
+       if(newswf.fileVersion < 6)
+           newswf.fileVersion = 6;
        swf_WriteSWC(fi, &newswf);
-    else {
+    } else {
        newswf.compressed = 0;
        swf_WriteSWF(fi, &newswf);
     }