[Scummvm-git-logs] scummvm master -> 278c6c809edd50f35ccd6b58982983b614a712fb

[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:
278c6c809e DIRECTOR: Fix crash on optimized out 32-bpp pictures


Commit: 278c6c809edd50f35ccd6b58982983b614a712fb
    https://github.com/scummvm/scummvm/commit/278c6c809edd50f35ccd6b58982983b614a712fb
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-04-11T13:04:30+02:00

Commit Message:
DIRECTOR: Fix crash on optimized out 32-bpp pictures

They still are not rendered correctly

Changed paths:
    engines/director/images.cpp


diff --git a/engines/director/images.cpp b/engines/director/images.cpp
index ae6fe7e562..97ef18da69 100644
--- a/engines/director/images.cpp
+++ b/engines/director/images.cpp
@@ -237,7 +237,7 @@ bool BITDDecoder::loadStream(Common::SeekableReadStream &stream) {
 	}
 
 	if (pixels.size() < (uint32)_surface->w * _surface->h) {
-		int tail = _surface->w * _surface->h - pixels.size();
+		int tail = (_surface->w * _surface->h * _bitsPerPixel / 8) - pixels.size();
 
 		warning("BITDDecoder::loadStream(): premature end of stream (%d of %d pixels)",
 			pixels.size(), pixels.size() + tail);