diff options
| author | Martin Kiewitz | 2015-07-04 03:29:06 +0200 |
|---|---|---|
| committer | Martin Kiewitz | 2015-07-04 03:29:06 +0200 |
| commit | a07ff810516c3982aba42210ff92680774bb18ac (patch) | |
| tree | 0485c3d1658519802093e3aa9617583616401d5c | |
| parent | f387785e57ab1aad0340ea3d207436972c630cf4 (diff) | |
| download | scummvm-rg350-a07ff810516c3982aba42210ff92680774bb18ac.tar.gz scummvm-rg350-a07ff810516c3982aba42210ff92680774bb18ac.tar.bz2 scummvm-rg350-a07ff810516c3982aba42210ff92680774bb18ac.zip | |
COMMON: PKWARE data comp. remove temp. targetPtr
which was used for the temporary workaround in commit 4fb3264
| -rw-r--r-- | common/dcl.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/common/dcl.cpp b/common/dcl.cpp index 2588fc57fd..5993c218cb 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; |