[Scummvm-git-logs] scummvm master -> c94208cc27defc9ee49d3f59fbc08ac627f89ed7

moralrecordings code at moral.net.au
Sun Jun 14 16:15:48 UTC 2020


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:
c94208cc27 DIRECTOR: Fix typo in compression size calculation


Commit: c94208cc27defc9ee49d3f59fbc08ac627f89ed7
    https://github.com/scummvm/scummvm/commit/c94208cc27defc9ee49d3f59fbc08ac627f89ed7
Author: Scott Percival (code at moral.net.au)
Date: 2020-06-15T00:15:33+08:00

Commit Message:
DIRECTOR: Fix typo in compression size calculation

Changed paths:
    engines/director/images.cpp


diff --git a/engines/director/images.cpp b/engines/director/images.cpp
index 7790eb6c6f..45ff4ae928 100644
--- a/engines/director/images.cpp
+++ b/engines/director/images.cpp
@@ -197,7 +197,7 @@ bool BITDDecoder::loadStream(Common::SeekableReadStream &stream) {
 	Common::Array<int> pixels;
 	// If the stream has exactly the required number of bits for this image,
 	// we assume it is uncompressed.
-	if (stream.size() * _bitsPerPixel / 8 == _surface->pitch * _surface->h) {
+	if (stream.size() == _surface->pitch * _surface->h * _bitsPerPixel / 8) {
 		debugC(6, kDebugImages, "Skipping compression");
 		for (uint i = 0; i < stream.size(); i++) {
 			pixels.push_back((int)stream.readByte());




More information about the Scummvm-git-logs mailing list