[Scummvm-git-logs] scummvm master -> 3bd3dee13d196ef8d051b60146ef9e9d0213624e

[npjg]

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:
a49feca451 DIRECTOR: Properly set image tail length
3bd3dee13d DIRECTOR: Make missing surface warning more helpful


Commit: a49feca451793cc3afbbb5e76848ccf09b3dce76
    https://github.com/scummvm/scummvm/commit/a49feca451793cc3afbbb5e76848ccf09b3dce76
Author: Nathanael Gentry (nathanael.gentrydb8 at gmail.com)
Date: 2020-08-10T14:46:23-04:00

Commit Message:
DIRECTOR: Properly set image tail length

Changed paths:
    engines/director/images.cpp


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


Commit: 3bd3dee13d196ef8d051b60146ef9e9d0213624e
    https://github.com/scummvm/scummvm/commit/3bd3dee13d196ef8d051b60146ef9e9d0213624e
Author: Nathanael Gentry (nathanael.gentrydb8 at gmail.com)
Date: 2020-08-10T14:46:23-04:00

Commit Message:
DIRECTOR: Make missing surface warning more helpful

Changed paths:
    engines/director/window.cpp


diff --git a/engines/director/window.cpp b/engines/director/window.cpp
index d6cf183c73..a38f0fd046 100644
--- a/engines/director/window.cpp
+++ b/engines/director/window.cpp
@@ -188,7 +188,7 @@ void Window::inkBlitFrom(Channel *channel, Common::Rect destRect, Graphics::Mana
 			inkBlitSurface(&pd, srcRect, channel->getMask());
 		}
 	} else {
-		warning("Window::inkBlitFrom: No source surface");
+		warning("Window::inkBlitFrom: No source surface: spriteType: %d, castType: %d, castId: %d", channel->_sprite->_spriteType, channel->_sprite->_cast ? channel->_sprite->_cast->_type : 0, channel->_sprite->_castId);
 	}
 }