[Scummvm-git-logs] scummvm master -> 054c674f79d4bb48daebea046088cfecdcd546f5

[sev-]

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:
054c674f79 DIRECTOR: Fix pitch calculation for BITDDecoder


Commit: 054c674f79d4bb48daebea046088cfecdcd546f5
    https://github.com/scummvm/scummvm/commit/054c674f79d4bb48daebea046088cfecdcd546f5
Author: Scott Percival (code at moral.net.au)
Date: 2023-01-16T17:51:19+01:00

Commit Message:
DIRECTOR: Fix pitch calculation for BITDDecoder

The expected decompression size for D4 and above was being mistakenly overwritten
by the D3 size.

Fixes leaves animation in GOODBYE.DIR for Chop Suey.

Changed paths:
    engines/director/images.cpp


diff --git a/engines/director/images.cpp b/engines/director/images.cpp
index a08fa9bb394..b9b52a21e11 100644
--- a/engines/director/images.cpp
+++ b/engines/director/images.cpp
@@ -177,10 +177,11 @@ bool BITDDecoder::loadStream(Common::SeekableReadStream &stream) {
 	bool skipCompression = false;
 	uint32 bytesNeed = _pitch * _surface->h;
 	if (_bitsPerPixel != 1) {
-		bytesNeed = _surface->w * _surface->h * _bitsPerPixel / 8;
 		if (_version < kFileVer300) {
+			bytesNeed = _surface->w * _surface->h * _bitsPerPixel / 8;
 			skipCompression = stream.size() >= bytesNeed;
 		} else if (_version < kFileVer400) {
+			bytesNeed = _surface->w * _surface->h * _bitsPerPixel / 8;
 			// for D3, looks like it will round up the _surface->w to align 2
 			// not sure whether D2 will have the same logic.
 			// check lzone-mac data/r-c/tank.a-1 and lzone-mac data/r-a/station-b.01.