git.asbjorn.biz
/
swftools.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
df2f5c4
)
When using -t, write correct Header and Backgroundcolor.
author
kramm
<kramm>
Fri, 7 Jun 2002 20:03:37 +0000
(20:03 +0000)
committer
kramm
<kramm>
Fri, 7 Jun 2002 20:03:37 +0000
(20:03 +0000)
src/swfcombine.c
patch
|
blob
|
history
diff --git
a/src/swfcombine.c
b/src/swfcombine.c
index
ce578af
..
1f10f65
100644
(file)
--- a/
src/swfcombine.c
+++ b/
src/swfcombine.c
@@
-259,14
+259,18
@@
static void makestackmaster(SWF*swf)
int t;
SRECT box;
int fileversion = 1;
int t;
SRECT box;
int fileversion = 1;
+ int frameRate = 256;
+ RGBA rgb;
+ rgb.r=rgb.b=rgb.g=0;
memset(&box, 0, sizeof(box));
/* scan all slaves for bounding box */
memset(&box, 0, sizeof(box));
/* scan all slaves for bounding box */
- for(t=0;t<numslaves;t++)
+ for(t=numslaves-1;t>=0;t--)
{
SWF head;
int ret;
int fi=open(slave_filename[t],O_RDONLY);
{
SWF head;
int ret;
int fi=open(slave_filename[t],O_RDONLY);
+ TAG*tag;
if(fi<0 || swf_ReadSWF(fi, &head)<0) {
logf("<fatal> Couldn't open/read %s.", slave_filename[t]);
exit(1);
if(fi<0 || swf_ReadSWF(fi, &head)<0) {
logf("<fatal> Couldn't open/read %s.", slave_filename[t]);
exit(1);
@@
-276,6
+280,17
@@
static void makestackmaster(SWF*swf)
slave_filename[t],
head.movieSize.xmin, head.movieSize.ymin,
head.movieSize.xmax, head.movieSize.ymax);
slave_filename[t],
head.movieSize.xmin, head.movieSize.ymin,
head.movieSize.xmax, head.movieSize.ymax);
+
+ tag = head.firstTag;
+ while(tag) {
+ if(tag->id == ST_SETBACKGROUNDCOLOR && tag->len>=3) {
+ rgb.r = tag->data[0];
+ rgb.g = tag->data[1];
+ rgb.b = tag->data[2];
+ }
+ tag=tag->next;
+ }
+ frameRate = head.frameRate;
if(head.fileVersion > fileversion)
fileversion = head.fileVersion;
if(!t)
if(head.fileVersion > fileversion)
fileversion = head.fileVersion;
if(!t)
@@
-297,12
+312,13
@@
static void makestackmaster(SWF*swf)
}
memset(swf, 0, sizeof(SWF));
}
memset(swf, 0, sizeof(SWF));
+ swf->fileVersion = fileversion;
+ swf->movieSize = box;
+ swf->frameRate = frameRate;
swf->firstTag = swf_InsertTag(0, ST_SETBACKGROUNDCOLOR);
tag = swf->firstTag;
swf->firstTag = swf_InsertTag(0, ST_SETBACKGROUNDCOLOR);
tag = swf->firstTag;
- swf_SetU8(tag, 0);
- swf_SetU8(tag, 0);
- swf_SetU8(tag, 0);
+ swf_SetRGB(tag, &rgb);
for(t=0;t<numslaves;t++)
{
for(t=0;t<numslaves;t++)
{