[Scummvm-git-logs] scummvm master -> ca5c7e911e57c7f11e9cba47227eab58cf397a8b

[sev-]

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:
0ab53413da VIDEO: QTVR: Add sanity check on initialization
ca5c7e911e DIRECTOR: XTRAS: Pass desired panorama size to QTVR player


Commit: 0ab53413daf042af6c6918532283d8cd634add7c
    https://github.com/scummvm/scummvm/commit/0ab53413daf042af6c6918532283d8cd634add7c
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2025-02-08T23:33:20+01:00

Commit Message:
VIDEO: QTVR: Add sanity check on initialization

Changed paths:
    video/qtvr_decoder.cpp


diff --git a/video/qtvr_decoder.cpp b/video/qtvr_decoder.cpp
index 72a46950522..ff25cd05f2d 100644
--- a/video/qtvr_decoder.cpp
+++ b/video/qtvr_decoder.cpp
@@ -438,6 +438,9 @@ void QuickTimeDecoder::PanoTrackHandler::projectPanorama() {
 	uint16 w = _decoder->getWidth(), h = _decoder->getHeight();
 
 	if (!_projectedPano) {
+		if (w == 0 || h == 0)
+			error("QuickTimeDecoder::PanoTrackHandler::projectPanorama(): setTargetSize() was not called");
+
 		_projectedPano = new Graphics::Surface();
 		_projectedPano->create(w, h, _constructedPano->format);
 


Commit: ca5c7e911e57c7f11e9cba47227eab58cf397a8b
    https://github.com/scummvm/scummvm/commit/ca5c7e911e57c7f11e9cba47227eab58cf397a8b
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2025-02-08T23:34:08+01:00

Commit Message:
DIRECTOR: XTRAS: Pass desired panorama size to QTVR player

Changed paths:
    engines/director/lingo/xtras/qtvrxtra.cpp


diff --git a/engines/director/lingo/xtras/qtvrxtra.cpp b/engines/director/lingo/xtras/qtvrxtra.cpp
index becbd3f1d49..dadf85664fc 100644
--- a/engines/director/lingo/xtras/qtvrxtra.cpp
+++ b/engines/director/lingo/xtras/qtvrxtra.cpp
@@ -362,6 +362,8 @@ void QtvrxtraXtra::m_QTVROpen(int nargs) {
 		return;
 	}
 
+	me->_video->setTargetSize(me->_rect.width(), me->_rect.height());
+
 	me->_widget = new QtvrxtraWidget(me, g_director->getCurrentWindow(),
 			me->_rect.left, me->_rect.top, me->_rect.width(), me->_rect.height(),
 			g_director->getMacWindowManager());