config.scalex = config.scaley = atoi(val)/100.0;
return 1;
}
+ else if (!strcmp(name, "w"))
+ {
+ config.scalex = atoi(val)/100.0;
+ return 1;
+ }
+ else if (!strcmp(name, "h"))
+ {
+ config.scaley = atoi(val)/100.0;
+ return 1;
+ }
else if (!strcmp(name, "t") || !strcmp(name, "T"))
{
if(master_filename) {
printf("-f , --frame The following identifier is a frame or framelabel, not an id or objectname\n");
printf("-x , --movex <xpos> x Adjust position of slave by <xpos> pixels\n");
printf("-y , --movey <ypos> y Adjust position of slave by <ypos> pixels\n");
- printf("-s , --scale <scale> Adjust size of slave by <scale> percent (e.g. 100% = original size)\n");
+ printf("-s , --scale <scale> Adjust size of slave by <scale> percent (e.g. 100%% = original size)\n");
printf("-r , --rate <fps> Set movie framerate to <fps> (frames/sec)\n");
printf("-X , --width <width> Force movie bbox width to <width> (default: use master width (not with -t))\n");
printf("-Y , --height <height> Force movie bbox height to <height> (default: use master height (not with -t))\n");
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;
}
}
}
if(tag_ok_for_slave(stag->id)) {
tag = swf_InsertTag(tag, stag->id);
- swf_SetBlock(tag, stag->data, stag->len);
+ write_changepos(tag, stag, config.movex, config.movey, config.scalex, config.scaley, 0);
}
stag = stag->next;
}
swf_SetDefineID(tag, replaceddefine);
} else {
/* don't write this tag */
- msg("<verbose> replacing tag %d id %d with sprite", rtag->id
- ,spriteid);
+ msg("<verbose> replacing tag %d ID %d with sprite", rtag->id ,spriteid);
}
if(flags&FLAGS_WRITESPRITE)
{
+ msg("<debug> writing sprite defines");
tag = write_sprite_defines(tag, slave);
+ msg("<debug> writing sprite");
tag = write_sprite(tag, slave, spriteid, replaceddefine);
}
if(flags&FLAGS_WRITESLAVE)
{
+ msg("<debug> writing slave");
outputslave = 1;
}
} else {
while(stag && stag->id!=ST_END)
{
if(tag_ok_for_slave(stag->id)) {
+ msg("<debug> [slave] write tag %02x (%d bytes in body), %.2f %.2f", rtag->id, rtag->len, config.movex /20.0, config.movey /20.0);
tag = swf_InsertTag(tag, stag->id);
- swf_SetBlock(tag, stag->data, stag->len);
+ write_changepos(tag, stag, config.movex, config.movey, config.scalex, config.scaley, 0);
}
stag = stag->next;
}
}
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)
char * name = swf_GetName(tag);
int id = swf_GetPlaceID(tag);
+ {
+ SWFPLACEOBJECT obj;
+ swf_GetPlaceObject(tag, &obj);
+ swf_PlaceObjectFree(&obj);
+ if(obj.clipdepth) {
+ depthbitmap[obj.clipdepth] = 1;
+ }
+ }
+
if(name)
msg("<verbose> tagid %02x places object %d named \"%s\"", tag->id, id, name);
else
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)
slaveid = -1;
slaveframe = -1;
+ if(!master->fileVersion && slave)
+ master->fileVersion = slave->fileVersion;
+
+ master->fileAttributes |= slave->fileAttributes;
+
swf_FoldAll(master);
swf_FoldAll(slave);
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) {
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) {
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
{
memset(&slave, 0, sizeof(slave));
slave.firstTag = swf_InsertTag(0, ST_END);
slave.frameRate = 0;
- slave.fileVersion = 4;
+ slave.fileVersion = 0;
slave.frameCount = 0;
}
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;
+ }
}
+ if(!newswf.fileVersion)
+ newswf.fileVersion = 4;
+
fi = open(outputname, O_BINARY|O_RDWR|O_TRUNC|O_CREAT, 0777);
if(config.zlib) {
if(newswf.fileVersion < 6)
newswf.fileVersion = 6;
- swf_WriteSWC(fi, &newswf);
+ newswf.compressed = 1;
+ swf_WriteSWF(fi, &newswf);
} else {
- newswf.compressed = 0;
+ newswf.compressed = -1; // don't compress
swf_WriteSWF(fi, &newswf);
}
close(fi);