[Scummvm-cvs-logs] SF.net SVN: scummvm: [29756] scummvm/trunk/engines/cine/part.cpp

[cyx at users.sourceforge.net]

Revision: 29756
          http://scummvm.svn.sourceforge.net/scummvm/?rev=29756&view=rev
Author:   cyx
Date:     2007-12-08 00:48:31 -0800 (Sat, 08 Dec 2007)

Log Message:
-----------
reverted part of commit #29749, inplace unpacking doesn't work with .ani data

Modified Paths:
--------------
    scummvm/trunk/engines/cine/part.cpp

Modified: scummvm/trunk/engines/cine/part.cpp
===================================================================
--- scummvm/trunk/engines/cine/part.cpp	2007-12-08 02:38:04 UTC (rev 29755)
+++ scummvm/trunk/engines/cine/part.cpp	2007-12-08 08:48:31 UTC (rev 29756)
@@ -251,8 +251,10 @@
 	assert(foundFileIdx >= 0 && foundFileIdx < numElementInPart);
 	byte *dataPtr = (byte *)calloc(partBuffer[foundFileIdx].unpackedSize, 1);
 	if (partBuffer[foundFileIdx].unpackedSize != partBuffer[foundFileIdx].packedSize) {
-		readFromPart(foundFileIdx, dataPtr);
-		delphineUnpack(dataPtr, dataPtr, partBuffer[foundFileIdx].packedSize);
+		byte *unpackBuffer = (byte *)malloc(partBuffer[foundFileIdx].packedSize);
+		readFromPart(foundFileIdx, unpackBuffer);
+		delphineUnpack(dataPtr, unpackBuffer, partBuffer[foundFileIdx].packedSize);
+		free(unpackBuffer);
 	} else {
 		readFromPart(foundFileIdx, dataPtr);
 	}


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.