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:
d4d73f4
)
implement header rewriting for -X, -Y, -r.
author
kramm
<kramm>
Thu, 6 Jun 2002 11:38:09 +0000
(11:38 +0000)
committer
kramm
<kramm>
Thu, 6 Jun 2002 11:38:09 +0000
(11:38 +0000)
src/swfcombine.c
patch
|
blob
|
history
diff --git
a/src/swfcombine.c
b/src/swfcombine.c
index
131f2b5
..
ce578af
100644
(file)
--- a/
src/swfcombine.c
+++ b/
src/swfcombine.c
@@
-720,6
+720,20
@@
TAG* write_master(TAG*tag, SWF*master, SWF*slave, int spriteid, int replaceddefi
return tag;
}
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;
void catcombine(SWF*master, char*slave_name, SWF*slave, SWF*newswf)
{
char* depths;
@@
-746,6
+760,8
@@
void catcombine(SWF*master, char*slave_name, SWF*slave, SWF*newswf)
jpeg_assert(master, slave);
memcpy(newswf, master, sizeof(SWF));
jpeg_assert(master, slave);
memcpy(newswf, master, sizeof(SWF));
+ adjustheader(newswf);
+
tag = newswf->firstTag = swf_InsertTag(0, ST_REFLEX); // to be removed later
depths = malloc(65536);
tag = newswf->firstTag = swf_InsertTag(0, ST_REFLEX); // to be removed later
depths = malloc(65536);
@@
-877,6
+893,8
@@
void normalcombine(SWF*master, char*slave_name, SWF*slave, SWF*newswf)
// write file
memcpy(newswf, master, sizeof(SWF));
// write file
memcpy(newswf, master, sizeof(SWF));
+ adjustheader(newswf);
+
newswf->firstTag = tag = swf_InsertTag(0, ST_REFLEX); // to be removed later
if (config.antistream) {
newswf->firstTag = tag = swf_InsertTag(0, ST_REFLEX); // to be removed later
if (config.antistream) {