# HG changeset patch
# User Mike Kinghan <mikek@symbian.org>
# Date 1288861629 0
# Node ID 10771bc49d011ed892f84383b85b637b3bad379a
# Parent  667e3f7728f7973f1ce54806fa1dcc50e8fcb0e5
1) Delete superflous copy of e32image from e32tools and fix e32tools build
to use the remaining copy in imgtools/imglib
2) Fix imgtools/imglib/e32image/deflate/decode.cpp to move memory instead of
invalidly copying memory, breaking rombuilds on 64-bit hosts.

diff -r 667e3f7728f7 -r 10771bc49d01 e32tools/e32lib/e32image/Makefile.elftran
--- a/e32tools/e32lib/e32image/Makefile.elftran	Tue Nov 02 14:32:27 2010 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,46 +0,0 @@
-# Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-# All rights reserved.                                             
-# This component and the accompanying materials are made available 
-# under the terms of the License "Eclipse Public License v1.0"     
-# which accompanies this distribution, and is available            
-# at the URL "http://www.eclipse.org/legal/epl-v10.html".          
-#                                                                  
-# Initial Contributors:                                            
-# Nokia Corporation - initial contribution.                        
-#                                                                  
-# Contributors:                                                    
-#                                                                  
-# Description:                                                     
-#
-
-CXX	 = g++296
-CXXFLAGS = -D__SUPPORT_ELF_FILES__ -D__LINUX__ -D__GCC32__ -D__TOOLS__ -D EKA2 \
-		-I $(EPOCROOT)epoc32/include -I ../inc -I ../elftools/inc
-SOURCE	 = elf_file.cpp elf_dlld.cpp elf_imp.cpp elf_reloc.cpp elf_tran.cpp \
-	   e32uid.cpp \
-	   h_file.cpp h_mem.cpp h_utl.cpp \
-	   e32image.cpp tr_main.cpp imgdump.cpp \
-	   decode.cpp encode.cpp deflate.cpp inflate.cpp panic.cpp compress.cpp
-BLDDIR	 = ../build-elftran
-OBJECT   = $(addprefix $(BLDDIR)/, $(notdir $(SOURCE:.cpp=.o)))
-TARGET	 = $(BLDDIR)/elftran
-
-VPATH	 = ../host ../e32uid ../e32image ../e32image/deflate ../elftools/elftran
-
-_dummy := $(shell mkdir -p $(BLDDIR))
-
-all: $(TARGET)
-
-$(TARGET): $(OBJECT)
-	$(CXX) $^ -o $@
-	strip $@
-	
-$(OBJECT): $(BLDDIR)/%.o: %.cpp
-	$(CXX) $(CXXFLAGS) -c $< -o $@
-
-clean:
-	rm -f $(OBJECT) $(TARGET)
-	-rmdir $(BLDDIR)
-
-.PHONY: all clean
-
diff -r 667e3f7728f7 -r 10771bc49d01 e32tools/e32lib/group/seclib.mmp
--- a/e32tools/e32lib/group/seclib.mmp	Tue Nov 02 14:32:27 2010 +0000
+++ b/e32tools/e32lib/group/seclib.mmp	Thu Nov 04 09:07:09 2010 +0000
@@ -23,10 +23,10 @@
 sourcepath		../seclib
 source			seclib.cpp
 
-sourcepath		../e32image
+sourcepath		../../../imgtools/imglib/e32image
 source			e32image.cpp
 
-sourcepath		../e32image/deflate
+sourcepath		../../../imgtools/imglib/e32image/deflate
 source			decode.cpp encode.cpp deflate.cpp inflate.cpp panic.cpp compress.cpp
 
 sourcepath      ../../../imgtools/imglib/compress
@@ -41,6 +41,7 @@
 sourcepath		../../../imgtools/imglib/host
 source			h_file.cpp h_mem.cpp h_utl.cpp
 
+userinclude     ../../../imgtools/imglib/inc
 userinclude     ../../../imgtools/imglib/compress
 userinclude     ../setcap 
 userinclude     ../../e32lib/e32image/inc
diff -r 667e3f7728f7 -r 10771bc49d01 imgtools/imglib/e32image/deflate/decode.cpp
--- a/imgtools/imglib/e32image/deflate/decode.cpp	Tue Nov 02 14:32:27 2010 +0000
+++ b/imgtools/imglib/e32image/deflate/decode.cpp	Thu Nov 04 09:07:09 2010 +0000
@@ -198,7 +198,7 @@
 			--c;
 			list[0]=TUint8(last);
 			last=list[c];
-			HMem::Copy(&list[1],&list[0],c);
+			HMem::Move(&list[1],&list[0],c);
 			if (p>end)
 				{
 				Panic(EHuffmanCorruptFile);