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 (from parent 1:
3f73c91
)
remove temporary tags.
author
kramm
<kramm>
Tue, 4 Jun 2002 18:58:37 +0000
(18:58 +0000)
committer
kramm
<kramm>
Tue, 4 Jun 2002 18:58:37 +0000
(18:58 +0000)
src/swfcombine.c
patch
|
blob
|
history
diff --git
a/src/swfcombine.c
b/src/swfcombine.c
index
a552fd8
..
131f2b5
100644
(file)
--- a/
src/swfcombine.c
+++ b/
src/swfcombine.c
@@
-746,7
+746,7
@@
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));
- tag = newswf->firstTag = swf_InsertTag(0, ST_REFLEX);
+ tag = newswf->firstTag = swf_InsertTag(0, ST_REFLEX); // to be removed later
depths = malloc(65536);
if(!depths) {
depths = malloc(65536);
if(!depths) {
@@
-806,6
+806,10
@@
void catcombine(SWF*master, char*slave_name, SWF*slave, SWF*newswf)
stag = stag->next;
}
tag = swf_InsertTag(tag, ST_END);
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)
}
void normalcombine(SWF*master, char*slave_name, SWF*slave, SWF*newswf)
@@
-873,7
+877,7
@@
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));
- newswf->firstTag = tag = swf_InsertTag(0, ST_REFLEX);
+ newswf->firstTag = tag = swf_InsertTag(0, ST_REFLEX); // to be removed later
if (config.antistream) {
if (config.merge) {
if (config.antistream) {
if (config.merge) {
@@
-891,6
+895,10
@@
void normalcombine(SWF*master, char*slave_name, SWF*slave, SWF*newswf)
tag = write_master(tag, master, slave, spriteid, replaceddefine,
FLAGS_WRITEDEFINES|FLAGS_WRITENONDEFINES|FLAGS_WRITESPRITE);
}
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)
}
void combine(SWF*master, char*slave_name, SWF*slave, SWF*newswf)