# HG changeset patch
# User Tom Sutcliffe <thomas.sutcliffe@accenture.com>
# Date 1287696834 -3600
# Node ID 4429a6c6320745d8c025e2d2670e16b6c79cbe0b
# Parent  dc41da2f70a462743433fe00795fab45c607e14e# Parent  ce94bcf3f67206a2ab96f08cda2956e2fda56f9e
merge.

diff -r dc41da2f70a4 -r 4429a6c63207 commands/chkdeps/chkdeps.cpp
--- a/commands/chkdeps/chkdeps.cpp	Thu Oct 21 22:32:59 2010 +0100
+++ b/commands/chkdeps/chkdeps.cpp	Thu Oct 21 22:33:54 2010 +0100
@@ -202,6 +202,7 @@
 		}
 	}
 
+// Adapted from E32Image::LoadFileBytePairUnpakL()
 void CDllChecker::LoadFileBytePairL(const E32ImageHeaderComp* aHeader, RBuf8& aCode, RBuf8& aRestOfFile)
 	{
 	TInt pos = aHeader->TotalSize();
@@ -245,11 +246,10 @@
 		{
 		LoadFileInflateL(aHeader, aCode, aRestOfFile);
 		}
-	/*TOMSCI TODO doesn't seem to work...
 	else if (aCompression == KUidCompressionBytePair)
 		{
 		LoadFileBytePairL(aHeader, aCode, aRestOfFile);
-		}*/
+		}
 	else
 		{
 		LeaveIfErr(KErrNotSupported, _L("Compression type 0x%x is not supported"), aCompression);
diff -r dc41da2f70a4 -r 4429a6c63207 commands/chkdeps/sf_pgcompr.cpp
--- a/commands/chkdeps/sf_pgcompr.cpp	Thu Oct 21 22:32:59 2010 +0100
+++ b/commands/chkdeps/sf_pgcompr.cpp	Thu Oct 21 22:33:54 2010 +0100
@@ -108,12 +108,10 @@
 	User::LeaveIfError(size);
 	if (size != aLength)
 		LEAVE_FAILURE(KErrCorrupt);
-	if (iNextPage + iIndexTable[aPageNum] != nextPage)
-		StaticLeaveIfErr(KErrCorrupt, _L("nextPage is %x, expected %x for pagenum %d"), nextPage, iNextPage + iIndexTable[aPageNum], aPageNum);
+//	if (iNextPage + iIndexTable[aPageNum] != nextPage)
+//		StaticLeaveIfErr(KErrCorrupt, _L("nextPage is %x, expected %x for pagenum %d"), nextPage, iNextPage + iIndexTable[aPageNum], aPageNum);
 //		LEAVE_FAILURE(KErrCorrupt);
 
-//TOMSCI	IoUtils::CCommandBase::Static().Printf(_L("nextPage is 0x%08x, iNextPage+%d\r\n"), nextPage, nextPage - iNextPage);
-
 	// If a memmove() was provided, use that to copy the data to its final target
 	if (aMemMoveFn)
 		aMemMoveFn(aTarget, iPageBuf, size);
diff -r dc41da2f70a4 -r 4429a6c63207 documentation/change_history.pod
--- a/documentation/change_history.pod	Thu Oct 21 22:32:59 2010 +0100
+++ b/documentation/change_history.pod	Thu Oct 21 22:33:54 2010 +0100
@@ -40,6 +40,11 @@
 
 =item *
 
+Updated chkdeps command so that it works with byte-pair compressed binaries (experimental).
+
+
+=item *
+
 Added L<showdebug|commands::showdebug> command to redirect RDebug::Print()s to the console.
 
 =back