git.asbjorn.biz
/
swftools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
added comment.
[swftools.git]
/
src
/
swfcombine.c
diff --git
a/src/swfcombine.c
b/src/swfcombine.c
index
f6257fe
..
5f86221
100644
(file)
--- a/
src/swfcombine.c
+++ b/
src/swfcombine.c
@@
-957,7
+957,8
@@
void normalcombine(SWF*master, char*slave_name, SWF*slave, SWF*newswf)
}
swf_Relocate (slave, masterbitmap);
}
swf_Relocate (slave, masterbitmap);
- swf_RelocateDepth (slave, depthbitmap);
+ if(config.merge)
+ swf_RelocateDepth (slave, depthbitmap);
jpeg_assert(slave, master);
if (config.overlay)
jpeg_assert(slave, master);
if (config.overlay)