From b75a03c88c7a57abe9e9bb92d1752c52ac6adfb2 Mon Sep 17 00:00:00 2001
From: kramm <kramm>
Date: Sat, 12 Jun 2004 16:09:14 +0000
Subject: [PATCH] fixed clip bug with -t.

---
 src/swfcombine.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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)
-- 
1.7.10.4