[Scummvm-git-logs] scummvm master -> 79136842851d97e49cac1b300e06c27e5bccfba8

sev- sev at scummvm.org
Thu Jan 23 14:03: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:
7913684285 DIRECTOR: Fix regression in BITD image parsing


Commit: 79136842851d97e49cac1b300e06c27e5bccfba8
    https://github.com/scummvm/scummvm/commit/79136842851d97e49cac1b300e06c27e5bccfba8
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-01-23T15:03:25+01:00

Commit Message:
DIRECTOR: Fix regression in BITD image parsing

Changed paths:
    engines/director/images.cpp


diff --git a/engines/director/images.cpp b/engines/director/images.cpp
index 723a19e..2228edd 100644
--- a/engines/director/images.cpp
+++ b/engines/director/images.cpp
@@ -202,8 +202,8 @@ bool BITDDecoder::loadStream(Common::SeekableReadStream &stream) {
 			stream.readUint16BE();
 	}
 
-	if (pixels.size() < _surface->pitch * _surface->h) {
-		int tail = _surface->pitch * _surface->h - pixels.size();
+	if (pixels.size() < _surface->w * _surface->h) {
+		int tail = _surface->w * _surface->h - pixels.size();
 
 		warning("BITDDecoder::loadStream(): premature end of stream (%d of %d pixels)",
 			pixels.size(), pixels.size() + tail);




More information about the Scummvm-git-logs mailing list