From: kramm <kramm>
Date: Sat, 12 Jun 2004 16:09:14 +0000 (+0000)
Subject: fixed clip bug with -t.
X-Git-Tag: release-0-6-0~104
X-Git-Url: http://git.asbjorn.biz/?p=swftools.git;a=commitdiff_plain;h=b75a03c88c7a57abe9e9bb92d1752c52ac6adfb2

fixed clip bug with -t.
---

diff --git a/src/swfcombine.c b/src/swfcombine.c
index f6257fe..5f86221 100644
--- 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)