[Scummvm-git-logs] scummvm master -> 4823eeab7a8e49744f96eaf8b8f4353e21ab1594

[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:
4823eeab7a DIRECTOR: Added STUB for non-8bpp videos instead of crashing


Commit: 4823eeab7a8e49744f96eaf8b8f4353e21ab1594
    https://github.com/scummvm/scummvm/commit/4823eeab7a8e49744f96eaf8b8f4353e21ab1594
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-08-11T23:58:25+02:00

Commit Message:
DIRECTOR: Added STUB for non-8bpp videos instead of crashing

Changed paths:
    engines/director/castmember.cpp


diff --git a/engines/director/castmember.cpp b/engines/director/castmember.cpp
index 83005e8092..451d9456c6 100644
--- a/engines/director/castmember.cpp
+++ b/engines/director/castmember.cpp
@@ -289,10 +289,13 @@ Graphics::MacWidget *DigitalVideoCastMember::createWidget(Common::Rect &bbox) {
 	}
 
 	const Graphics::Surface *frame = _video->decodeNextFrame();
-	if (frame)
-		widget->getSurface()->blitFrom(*frame);
-
-	delete frame;
+	if (frame) {
+		if (frame->format.bytesPerPixel != 1) {
+			warning("STUB: video >8bpp");
+		} else {
+			widget->getSurface()->blitFrom(*frame);
+		}
+	}
 
 	return widget;
 }