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:
a21341e
)
more bugfixes.
author
kramm
<kramm>
Tue, 4 Jun 2002 17:28:13 +0000
(17:28 +0000)
committer
kramm
<kramm>
Tue, 4 Jun 2002 17:28:13 +0000
(17:28 +0000)
src/swfcombine.c
patch
|
blob
|
history
diff --git
a/src/swfcombine.c
b/src/swfcombine.c
index
03d6d95
..
59975c8
100644
(file)
--- a/
src/swfcombine.c
+++ b/
src/swfcombine.c
@@
-377,18
+377,18
@@
void jpeg_assert(SWF*master, SWF*slave)
spos = stag;
stag = stag->next;
}
spos = stag;
stag = stag->next;
}
- if(!mtag && !stag)
+ if(mpos && spos)
{
{
- if(stag->len == mtag->len &&
- !memcmp(stag->data, mtag->data, mtag->len))
+ if(spos->len == mpos->len &&
+ !memcmp(spos->data, mpos->data, mpos->len))
{
// ok, both have jpegtables, but they're identical.
// delete one and don't throw an error
{
// ok, both have jpegtables, but they're identical.
// delete one and don't throw an error
- swf_DeleteTag(stag);
+ swf_DeleteTag(spos);
spos = 0;
}
}
spos = 0;
}
}
- if(spos>=0 && mpos>=0) {
+ if(spos && mpos) {
logf("<error> Master and slave have incompatible JPEGTABLES.");
}
}
logf("<error> Master and slave have incompatible JPEGTABLES.");
}
}
@@
-554,12
+554,12
@@
TAG* write_sprite(TAG*tag, SWF*sprite, int spriteid, int replaceddefine)
{
if (swf_isAllowedSpriteTag(rtag)) {
{
if (swf_isAllowedSpriteTag(rtag)) {
- changedepth(rtag, +1);
logf("<debug> [sprite main] write tag %02x (%d bytes in body)",
rtag->id, rtag->len);
logf("<debug> [sprite main] write tag %02x (%d bytes in body)",
rtag->id, rtag->len);
-
tag = swf_InsertTag(tag, rtag->id);
tag = swf_InsertTag(tag, rtag->id);
- write_changepos(rtag, tag);
+ write_changepos(tag, rtag);
+
+ changedepth(tag, +1);
if(tag->id == ST_SHOWFRAME)
{
if(tag->id == ST_SHOWFRAME)
{
@@
-694,7
+694,7
@@
TAG* write_master(TAG*tag, SWF*master, SWF*slave, int spriteid, int replaceddefi
swf_SetBlock(tag, rtag->data, rtag->len);
}
}
swf_SetBlock(tag, rtag->data, rtag->len);
}
}
- tag = tag->next;
+ rtag = rtag->next;
}
if(outputslave)
}
if(outputslave)
@@
-815,16
+815,16
@@
void normalcombine(SWF*master, char*slave_name, SWF*slave, SWF*newswf)
{
if(swf_isDefiningTag(tag)) {
int defineid = swf_GetDefineID(tag);
{
if(swf_isDefiningTag(tag)) {
int defineid = swf_GetDefineID(tag);
- logf("<debug> tagid %02x defines object %d", tag, defineid);
+ logf("<debug> tagid %02x defines object %d", tag->id, defineid);
masterbitmap[defineid] = 1;
} else if(tag->id == ST_PLACEOBJECT2) {
char * name = swf_GetName(tag);
int id = swf_GetPlaceID(tag);
if(name)
masterbitmap[defineid] = 1;
} else if(tag->id == ST_PLACEOBJECT2) {
char * name = swf_GetName(tag);
int id = swf_GetPlaceID(tag);
if(name)
- logf("<verbose> tagid %02x places object %d named \"%s\"", tag, id, name);
+ logf("<verbose> tagid %02x places object %d named \"%s\"", tag->id, id, name);
else
else
- logf("<verbose> tagid %02x places object %d (no name)", tag, id);
+ logf("<verbose> tagid %02x places object %d (no name)", tag->id, id);
if ((name && slavename && !strcmp(name,slavename)) ||
(!slavename && id==slaveid)) {
if ((name && slavename && !strcmp(name,slavename)) ||
(!slavename && id==slaveid)) {
@@
-1086,10
+1086,13
@@
int main(int argn, char *argv[])
}
fi = open(outputname, O_RDWR|O_TRUNC|O_CREAT);
}
fi = open(outputname, O_RDWR|O_TRUNC|O_CREAT);
+
if(config.zlib)
swf_WriteSWC(fi, &newswf);
if(config.zlib)
swf_WriteSWC(fi, &newswf);
- else
+ else {
+ newswf.compressed = 0;
swf_WriteSWF(fi, &newswf);
swf_WriteSWF(fi, &newswf);
+ }
close(fi);
return 0;
}
close(fi);
return 0;
}