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:
7f26c97
)
fixed clip bug with -t.
author
kramm
<kramm>
Sat, 12 Jun 2004 16:09:14 +0000
(16:09 +0000)
committer
kramm
<kramm>
Sat, 12 Jun 2004 16:09:14 +0000
(16:09 +0000)
src/swfcombine.c
patch
|
blob
|
history
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_RelocateDepth (slave, depthbitmap);
+ if(config.merge)
+ swf_RelocateDepth (slave, depthbitmap);
jpeg_assert(slave, master);
if (config.overlay)