printf("\n");
}
+void removeCommonTags(SWF * swf)
+{
+ TAG*tag = swf->firstTag;
+ while(tag) {
+ if(tag->id == ST_SCENEDESCRIPTION ||
+ tag->id == ST_FILEATTRIBUTES ||
+ tag->id == ST_REFLEX) {
+ tag = swf_DeleteTag(swf, tag);
+ } else {
+ tag = tag->next;
+ }
+ }
+}
+
static void makestackmaster(SWF*swf)
{
TAG*tag;
SRECT box;
int fileversion = config.zlib?6:3;
int frameRate = 256;
+ U32 fileAttributes = 0;
RGBA rgb;
rgb.r=rgb.b=rgb.g=0;
memset(&box, 0, sizeof(box));
}
close(fi);
swf_RemoveJPEGTables(&head);
+ fileAttributes |= head.fileAttributes;
+ removeCommonTags(&head);
+
msg("<verbose> File %s has bounding box %d:%d:%d:%d\n",
slave_filename[t],
head.movieSize.xmin, head.movieSize.ymin,
swf->fileVersion = fileversion;
swf->movieSize = box;
swf->frameRate = frameRate;
+ swf->fileAttributes = fileAttributes;
swf->firstTag = swf_InsertTag(0, ST_SETBACKGROUNDCOLOR);
tag = swf->firstTag;
{
// ok, both have jpegtables, but they're identical.
// delete one and don't throw an error
- swf_DeleteTag(spos);
+ swf_DeleteTag(slave, spos);
spos = 0;
}
}
}
tag = swf_InsertTag(tag, ST_END);
- tag = newswf->firstTag;
- newswf->firstTag = newswf->firstTag->next; //remove temporary tag
- swf_DeleteTag(tag);
+ swf_DeleteTag(newswf, tag);
}
void normalcombine(SWF*master, char*slave_name, SWF*slave, SWF*newswf)
FLAGS_WRITEDEFINES|FLAGS_WRITENONDEFINES| FLAGS_WRITESPRITE );
}
- tag = newswf->firstTag;
- newswf->firstTag = newswf->firstTag->next; //remove temporary tag
- swf_DeleteTag(tag);
+ swf_DeleteTag(newswf, newswf->firstTag);
}
void combine(SWF*master, char*slave_name, SWF*slave, SWF*newswf)
if(!master->fileVersion && slave)
master->fileVersion = slave->fileVersion;
+
+ master->fileAttributes |= slave->fileAttributes;
swf_FoldAll(master);
swf_FoldAll(slave);
exit(1);
}
swf_RemoveJPEGTables(&master);
+ removeCommonTags(&master);
msg("<debug> Read %d bytes from masterfile\n", ret);
close(fi);
}
msg("<debug> Read %d bytes from slavefile\n", ret);
close(fi);
swf_RemoveJPEGTables(&slave);
+ removeCommonTags(&slave);
}
else
{