{
float rate = atof(val);
- if ((rate < 1.0/256) ||(rate >= 256.0)) {
+ if ((rate < 0) ||(rate >= 256.0)) {
fprintf(stderr, "Error: You must specify a valid framerate between 1/256 and 255.\n");
exit(1);
}
exit(1);
}
close(fi);
+ swf_RemoveJPEGTables(&head);
msg("<verbose> File %s has bounding box %d:%d:%d:%d\n",
slave_filename[t],
head.movieSize.xmin, head.movieSize.ymin,
TAG* write_master(TAG*tag, SWF*master, SWF*slave, int spriteid, int replaceddefine, int flags)
{
int outputslave = 0;
- int frame = 0;
+ int frame = 1;
int sframe = 0;
int slavewritten = 0;
+ int deletedepth = -1;
TAG* rtag = master->firstTag;
TAG* stag = slave->firstTag;
if(rtag->id == ST_SHOWFRAME)
{
frame ++;
+ tag = swf_InsertTag(tag, ST_SHOWFRAME);
+ if(deletedepth>=0) {
+ tag = swf_InsertTag(tag, ST_REMOVEOBJECT2);
+ swf_SetU16(tag, deletedepth);
+ deletedepth=-1;
+ }
+ rtag = rtag->next;
+ continue;
}
if(swf_isDefiningTag(rtag) && (flags&FLAGS_WRITEDEFINES))
swf_SetBlock(tag, rtag->data, rtag->len);
}
}
- if(frame == slaveframe)
+ if(frame == slaveframe) /* only happens with config.isframe: put slave at specific frame */
{
if(flags&FLAGS_WRITESLAVE) {
outputslave = 1;
{
int id = get_free_id(masterbitmap);
int depth = 65535;
+ deletedepth = 65535;
if(config.clip) {
msg("<fatal> Can't combine --clip and --frame");
}
rtag->id, rtag->len);
tag = swf_InsertTag(tag, rtag->id);
write_changepos(tag, rtag, config.mastermovex, config.mastermovey, config.masterscalex, config.masterscaley, 1);
+
}
}
rtag = rtag->next;
slaveid = -1;
slaveframe = -1;
+ if(!master->fileVersion && slave)
+ master->fileVersion = slave->fileVersion;
+
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) {
msg("<fatal> Failed to read from %s\n", master_filename);
exit(1);
}
+ swf_RemoveJPEGTables(&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);
}
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) {