[Scummvm-cvs-logs] scummvm master -> a07ff810516c3982aba42210ff92680774bb18ac

m-kiewitz m_kiewitz at users.sourceforge.net
Sat Jul 4 03:33:50 CEST 2015


This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
a07ff81051 COMMON: PKWARE data comp. remove temp. targetPtr


Commit: a07ff810516c3982aba42210ff92680774bb18ac
    https://github.com/scummvm/scummvm/commit/a07ff810516c3982aba42210ff92680774bb18ac
Author: Martin Kiewitz (m_kiewitz at users.sourceforge.net)
Date: 2015-07-04T03:29:06+02:00

Commit Message:
COMMON: PKWARE data comp. remove temp. targetPtr

which was used for the temporary workaround in commit 4fb3264

Changed paths:
    common/dcl.cpp



diff --git a/common/dcl.cpp b/common/dcl.cpp
index 2588fc5..5993c21 100644
--- a/common/dcl.cpp
+++ b/common/dcl.cpp
@@ -30,7 +30,7 @@ namespace Common {
 
 class DecompressorDCL {
 public:
-	bool unpack(SeekableReadStream *sourceStream, WriteStream *targetStream, uint32 targetSize, bool targetFixedSize, byte *targetPtr);
+	bool unpack(SeekableReadStream *sourceStream, WriteStream *targetStream, uint32 targetSize, bool targetFixedSize);
 
 protected:
 	/**
@@ -334,7 +334,7 @@ int DecompressorDCL::huffman_lookup(const int *tree) {
 
 #define MIDI_SETUP_BUNDLE_FILE_MAXIMUM_DICTIONARY_SIZE 4096
 
-bool DecompressorDCL::unpack(SeekableReadStream *sourceStream, WriteStream *targetStream, uint32 targetSize, bool targetFixedSize, byte *targetPtr) {
+bool DecompressorDCL::unpack(SeekableReadStream *sourceStream, WriteStream *targetStream, uint32 targetSize, bool targetFixedSize) {
 	byte   dictionary[MIDI_SETUP_BUNDLE_FILE_MAXIMUM_DICTIONARY_SIZE];
 	uint16 dictionaryPos = 0;
 	uint16 dictionarySize = 0;
@@ -471,7 +471,7 @@ bool decompressDCL(ReadStream *src, byte *dest, uint32 packedSize, uint32 unpack
 	Common::MemoryReadStream  *sourceStream = new MemoryReadStream(sourceBufferPtr, packedSize, DisposeAfterUse::NO);
 	Common::MemoryWriteStream *targetStream = new MemoryWriteStream(dest, unpackedSize);
 
-	success = dcl.unpack(sourceStream, targetStream, unpackedSize, true, dest);
+	success = dcl.unpack(sourceStream, targetStream, unpackedSize, true);
 	delete sourceStream;
 	delete targetStream;
 	return success;
@@ -489,7 +489,7 @@ SeekableReadStream *decompressDCL(SeekableReadStream *sourceStream, uint32 packe
 
 	targetStream = new MemoryWriteStream(targetPtr, unpackedSize);
 
-	success = dcl.unpack(sourceStream, targetStream, unpackedSize, true, targetPtr);
+	success = dcl.unpack(sourceStream, targetStream, unpackedSize, true);
 	delete targetStream;
 
 	if (!success) {
@@ -507,7 +507,7 @@ SeekableReadStream *decompressDCL(SeekableReadStream *sourceStream) {
 
 	targetStream = new MemoryWriteStreamDynamic(DisposeAfterUse::NO);
 
-	if (dcl.unpack(sourceStream, targetStream, 0, false, nullptr)) {
+	if (dcl.unpack(sourceStream, targetStream, 0, false)) {
 		byte *targetPtr = targetStream->getData();
 		uint32 unpackedSize = targetStream->size();
 		delete targetStream;






More information about the Scummvm-git-logs mailing list