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)
{
char* depths;
jpeg_assert(master, slave);
memcpy(newswf, master, sizeof(SWF));
- tag = newswf->firstTag = swf_InsertTag(0, ST_REFLEX);
+ adjustheader(newswf);
+
+ tag = newswf->firstTag = swf_InsertTag(0, ST_REFLEX); // to be removed later
depths = malloc(65536);
if(!depths) {
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)
// 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) {
tag = write_master(tag, master, slave, spriteid, replaceddefine,
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)