[Scummvm-cvs-logs] scummvm master -> 7707f053389f2c4ef8491be611d32615eb529f73

[bluegr]

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

Summary:
65a36315ea COMMON: The DCL decompressor is also used in neverhood
7707f05338 COMMON: Throw a warning on inconsistent DCL fixed size buffers


Commit: 65a36315eab3f821e0fff232b32d6b58110804f9
    https://github.com/scummvm/scummvm/commit/65a36315eab3f821e0fff232b32d6b58110804f9
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2015-11-19T02:05:12+02:00

Commit Message:
COMMON: The DCL decompressor is also used in neverhood

Changed paths:
    common/dcl.h



diff --git a/common/dcl.h b/common/dcl.h
index f90bc23..ade7ebd 100644
--- a/common/dcl.h
+++ b/common/dcl.h
@@ -25,6 +25,7 @@
  * PKWARE DCL ("explode") ("PKWARE data compression library") decompressor used in engines:
  * - agos (exclusively for Simon 2 setup.shr file)
  * - mohawk
+ * - neverhood
  * - sci
  */
 


Commit: 7707f053389f2c4ef8491be611d32615eb529f73
    https://github.com/scummvm/scummvm/commit/7707f053389f2c4ef8491be611d32615eb529f73
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2015-11-19T02:05:12+02:00

Commit Message:
COMMON: Throw a warning on inconsistent DCL fixed size buffers

This is useful for debugging, and needed for fixes in Russian fan made
translations of The Neverhood Chronicles

Changed paths:
    common/dcl.cpp



diff --git a/common/dcl.cpp b/common/dcl.cpp
index 5993c21..66dfb76 100644
--- a/common/dcl.cpp
+++ b/common/dcl.cpp
@@ -449,6 +449,8 @@ bool DecompressorDCL::unpack(SeekableReadStream *sourceStream, WriteStream *targ
 	}
 
 	if (_targetFixedSize) {
+		if (_bytesWritten != _targetSize)
+			warning("DCL-INFLATE Error: Inconsistent bytes written (%d) and target buffer size (%d)", _bytesWritten, _targetSize);
 		return _bytesWritten == _targetSize;
 	}
 	return true; // For targets featuring dynamic size we always succeed