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

sev- noreply at scummvm.org
Mon Feb 10 11:19:54 UTC 2025


This automated email contains information about 3 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
0c482faee4 DIRECTOR: XTRAS: Clarify/unstub some of the basic QTVR methods
3e2b369fb7 JANITORIAL: Whitespace formatting
3b5d67cfbd DIRECTOR: XTRAS: Stretch QTVR image when needed


Commit: 0c482faee487641ea053bcf53967f5a9f623a8de
    https://github.com/scummvm/scummvm/commit/0c482faee487641ea053bcf53967f5a9f623a8de
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2025-02-10T11:46:24+01:00

Commit Message:
DIRECTOR: XTRAS: Clarify/unstub some of the basic QTVR methods

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 dadf85664fc..6834e176411 100644
--- a/engines/director/lingo/xtras/qtvrxtra.cpp
+++ b/engines/director/lingo/xtras/qtvrxtra.cpp
@@ -389,7 +389,6 @@ void QtvrxtraXtra::m_QTVRClose(int nargs) {
 XOBJSTUB(QtvrxtraXtra::m_QTVRUpdate, 0)
 
 void QtvrxtraXtra::m_QTVRGetQTVRType(int nargs) {
-	g_lingo->printArgs("QtvrxtraXtra::m_QTVRGetQTVRType", nargs);
 	ARGNUMCHECK(0);
 
 	QtvrxtraXtraObject *me = (QtvrxtraXtraObject *)g_lingo->_state->me.u.obj;
@@ -409,7 +408,6 @@ void QtvrxtraXtra::m_QTVRGetQTVRType(int nargs) {
 }
 
 void QtvrxtraXtra::m_QTVRIdle(int nargs) {
-	g_lingo->printArgs("QtvrxtraXtra::m_QTVRGetQTVRType", nargs);
 	ARGNUMCHECK(0);
 
 	QtvrxtraXtraObject *me = (QtvrxtraXtraObject *)g_lingo->_state->me.u.obj;
@@ -759,12 +757,11 @@ void QtvrxtraXtra::m_QTVRPassMouseDown(int nargs) {
 }
 
 void QtvrxtraXtra::m_IsQTVRMovie(int nargs) {
-	g_lingo->printArgs("QtvrxtraXtra::m_IsQTVRMovie", nargs);
 	ARGNUMCHECK(0);
 
 	QtvrxtraXtraObject *me = (QtvrxtraXtraObject *)g_lingo->_state->me.u.obj;
 
-	g_lingo->push((int)(me->_video && me->_video->isVideoLoaded()));
+	g_lingo->push((int)(me->_video && me->_video->isVideoLoaded() && me->_video->isVR()));
 }
 
 ///////////////


Commit: 3e2b369fb720a28d524da71adc7b853300d7b875
    https://github.com/scummvm/scummvm/commit/3e2b369fb720a28d524da71adc7b853300d7b875
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2025-02-10T11:48:33+01:00

Commit Message:
JANITORIAL: Whitespace formatting

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 6834e176411..f336f1830c1 100644
--- a/engines/director/lingo/xtras/qtvrxtra.cpp
+++ b/engines/director/lingo/xtras/qtvrxtra.cpp
@@ -163,71 +163,71 @@ const XlibFileDesc QtvrxtraXtra::fileNames[] = {
 };
 
 static const MethodProto xlibMethods[] = {
-	{ "new",				QtvrxtraXtra::m_new,		 0, 0,	500 },
-	{ "forget",				QtvrxtraXtra::m_forget,		 0, 0,	500 },
-	{ "QTVREnter",			QtvrxtraXtra::m_QTVREnter,	 0, 0,	500 },
-	{ "QTVRExit",			QtvrxtraXtra::m_QTVRExit,	 0, 0,	500 },
-	{ "QTVROpen",				QtvrxtraXtra::m_QTVROpen,		 3, 3,	500 },
-	{ "QTVRClose",				QtvrxtraXtra::m_QTVRClose,		 0, 0,	500 },
-	{ "QTVRUpdate",				QtvrxtraXtra::m_QTVRUpdate,		 0, 0,	500 },
+	{ "new",							QtvrxtraXtra::m_new,		 0, 0,	500 },
+	{ "forget",							QtvrxtraXtra::m_forget,		 0, 0,	500 },
+	{ "QTVREnter",						QtvrxtraXtra::m_QTVREnter,	 0, 0,	500 },
+	{ "QTVRExit",						QtvrxtraXtra::m_QTVRExit,	 0, 0,	500 },
+	{ "QTVROpen",						QtvrxtraXtra::m_QTVROpen,		 3, 3,	500 },
+	{ "QTVRClose",						QtvrxtraXtra::m_QTVRClose,		 0, 0,	500 },
+	{ "QTVRUpdate",						QtvrxtraXtra::m_QTVRUpdate,		 0, 0,	500 },
 	{ "QTVRGetQTVRType",				QtvrxtraXtra::m_QTVRGetQTVRType,		 0, 0,	500 },
-	{ "QTVRIdle",				QtvrxtraXtra::m_QTVRIdle,		 0, 0,	500 },
-	{ "QTVRMouseDown",				QtvrxtraXtra::m_QTVRMouseDown,		 0, 0,	500 },
-	{ "QTVRMouseOver",				QtvrxtraXtra::m_QTVRMouseOver,		 0, 0,	500 },
+	{ "QTVRIdle",						QtvrxtraXtra::m_QTVRIdle,		 0, 0,	500 },
+	{ "QTVRMouseDown",					QtvrxtraXtra::m_QTVRMouseDown,		 0, 0,	500 },
+	{ "QTVRMouseOver",					QtvrxtraXtra::m_QTVRMouseOver,		 0, 0,	500 },
 	{ "QTVRGetPanAngle",				QtvrxtraXtra::m_QTVRGetPanAngle,		 0, 0,	500 },
 	{ "QTVRSetPanAngle",				QtvrxtraXtra::m_QTVRSetPanAngle,		 1, 1,	500 },
 	{ "QTVRGetTiltAngle",				QtvrxtraXtra::m_QTVRGetTiltAngle,		 0, 0,	500 },
 	{ "QTVRSetTiltAngle",				QtvrxtraXtra::m_QTVRSetTiltAngle,		 1, 1,	500 },
-	{ "QTVRGetFOV",				QtvrxtraXtra::m_QTVRGetFOV,		 0, 0,	500 },
-	{ "QTVRSetFOV",				QtvrxtraXtra::m_QTVRSetFOV,		 1, 1,	500 },
+	{ "QTVRGetFOV",						QtvrxtraXtra::m_QTVRGetFOV,		 0, 0,	500 },
+	{ "QTVRSetFOV",						QtvrxtraXtra::m_QTVRSetFOV,		 1, 1,	500 },
 	{ "QTVRGetClickLoc",				QtvrxtraXtra::m_QTVRGetClickLoc,		 0, 0,	500 },
 	{ "QTVRSetClickLoc",				QtvrxtraXtra::m_QTVRSetClickLoc,		 1, 0,	500 },
-	{ "QTVRGetClickPanAngles",				QtvrxtraXtra::m_QTVRGetClickPanAngles,		 0, 0,	500 },
+	{ "QTVRGetClickPanAngles",			QtvrxtraXtra::m_QTVRGetClickPanAngles,		 0, 0,	500 },
 	{ "QTVRGetClickPanLoc",				QtvrxtraXtra::m_QTVRGetClickPanLoc,		 0, 0,	500 },
 	{ "QTVRGetHotSpotID",				QtvrxtraXtra::m_QTVRGetHotSpotID,		 0, 0,	500 },
 	{ "QTVRSetHotSpotID",				QtvrxtraXtra::m_QTVRSetHotSpotID,		 1, 0,	500 },
 	{ "QTVRGetHotSpotName",				QtvrxtraXtra::m_QTVRGetHotSpotName,		 0, 0,	500 },
 	{ "QTVRGetHotSpotType",				QtvrxtraXtra::m_QTVRGetHotSpotType,		 0, 0,	500 },
-	{ "QTVRGetHotSpotViewAngles",				QtvrxtraXtra::m_QTVRGetHotSpotViewAngles,		 0, 0,	500 },
-	{ "QTVRGetObjectViewAngles",				QtvrxtraXtra::m_QTVRGetObjectViewAngles,		 0, 0,	500 },
-	{ "QTVRGetObjectZoomRect",				QtvrxtraXtra::m_QTVRGetObjectZoomRect,		 0, 0,	500 },
-	{ "QTVRGetNodeID",				QtvrxtraXtra::m_QTVRGetNodeID,		 0, 0,	500 },
-	{ "QTVRSetNodeID",				QtvrxtraXtra::m_QTVRSetNodeID,		 1, 1,	500 },
+	{ "QTVRGetHotSpotViewAngles",		QtvrxtraXtra::m_QTVRGetHotSpotViewAngles,		 0, 0,	500 },
+	{ "QTVRGetObjectViewAngles",		QtvrxtraXtra::m_QTVRGetObjectViewAngles,		 0, 0,	500 },
+	{ "QTVRGetObjectZoomRect",			QtvrxtraXtra::m_QTVRGetObjectZoomRect,		 0, 0,	500 },
+	{ "QTVRGetNodeID",					QtvrxtraXtra::m_QTVRGetNodeID,		 0, 0,	500 },
+	{ "QTVRSetNodeID",					QtvrxtraXtra::m_QTVRSetNodeID,		 1, 1,	500 },
 	{ "QTVRGetNodeName",				QtvrxtraXtra::m_QTVRGetNodeName,		 0, 0,	500 },
-	{ "QTVRGetQuality",				QtvrxtraXtra::m_QTVRGetQuality,		 0, 0,	500 },
-	{ "QTVRSetQuality",				QtvrxtraXtra::m_QTVRSetQuality,		 1, 1,	500 },
-	{ "QTVRGetTransitionMode",				QtvrxtraXtra::m_QTVRGetTransitionMode,		 0, 0,	500 },
-	{ "QTVRSetTransitionMode",				QtvrxtraXtra::m_QTVRSetTransitionMode,		 1, 1,	500 },
-	{ "QTVRGetTransitionSpeed",				QtvrxtraXtra::m_QTVRGetTransitionSpeed,		 0, 0,	500 },
-	{ "QTVRSetTransitionSpeed",				QtvrxtraXtra::m_QTVRSetTransitionSpeed,		 1, 1,	500 },
+	{ "QTVRGetQuality",					QtvrxtraXtra::m_QTVRGetQuality,		 0, 0,	500 },
+	{ "QTVRSetQuality",					QtvrxtraXtra::m_QTVRSetQuality,		 1, 1,	500 },
+	{ "QTVRGetTransitionMode",			QtvrxtraXtra::m_QTVRGetTransitionMode,		 0, 0,	500 },
+	{ "QTVRSetTransitionMode",			QtvrxtraXtra::m_QTVRSetTransitionMode,		 1, 1,	500 },
+	{ "QTVRGetTransitionSpeed",			QtvrxtraXtra::m_QTVRGetTransitionSpeed,		 0, 0,	500 },
+	{ "QTVRSetTransitionSpeed",			QtvrxtraXtra::m_QTVRSetTransitionSpeed,		 1, 1,	500 },
 	{ "QTVRGetUpdateMode",				QtvrxtraXtra::m_QTVRGetUpdateMode,		 0, 0,	500 },
 	{ "QTVRSetUpdateMode",				QtvrxtraXtra::m_QTVRSetUpdateMode,		 1, 1,	500 },
-	{ "QTVRGetVisible",				QtvrxtraXtra::m_QTVRGetVisible,		 0, 0,	500 },
-	{ "QTVRSetVisible",				QtvrxtraXtra::m_QTVRSetVisible,		 1, 1,	500 },
+		{ "QTVRGetVisible",				QtvrxtraXtra::m_QTVRGetVisible,		 0, 0,	500 },
+		{ "QTVRSetVisible",				QtvrxtraXtra::m_QTVRSetVisible,		 1, 1,	500 },
 	{ "QTVRGetWarpMode",				QtvrxtraXtra::m_QTVRGetWarpMode,		 0, 0,	500 },
 	{ "QTVRSetWarpMode",				QtvrxtraXtra::m_QTVRSetWarpMode,		 1, 0,	500 },
-	{ "QTVRCollapseToHotSpotRgn",				QtvrxtraXtra::m_QTVRCollapseToHotSpotRgn,		 0, 0,	500 },
+	{ "QTVRCollapseToHotSpotRgn",		QtvrxtraXtra::m_QTVRCollapseToHotSpotRgn,		 0, 0,	500 },
 	{ "QTVRZoomOutEffect",				QtvrxtraXtra::m_QTVRZoomOutEffect,		 3, 0,	500 },
-	{ "QTVRGetColumn",				QtvrxtraXtra::m_QTVRGetColumn,		 0, 0,	500 },
-	{ "QTVRSetColumn",				QtvrxtraXtra::m_QTVRSetColumn,		 1, 1,	500 },
-	{ "QTVRGetRow",				QtvrxtraXtra::m_QTVRGetRow,		 0, 0,	500 },
-	{ "QTVRSetRow",				QtvrxtraXtra::m_QTVRSetRow,		 1, 1,	500 },
-	{ "QTVRNudge",				QtvrxtraXtra::m_QTVRNudge,		 1, 1,	500 },
-	{ "QTVRGetMouseDownHandler",				QtvrxtraXtra::m_QTVRGetMouseDownHandler,		 0, 0,	500 },
-	{ "QTVRSetMouseDownHandler",				QtvrxtraXtra::m_QTVRSetMouseDownHandler,		 1, 0,	500 },
-	{ "QTVRGetMouseOverHandler",				QtvrxtraXtra::m_QTVRGetMouseOverHandler,		 0, 0,	500 },
-	{ "QTVRSetMouseOverHandler",				QtvrxtraXtra::m_QTVRSetMouseOverHandler,		 1, 0,	500 },
-	{ "QTVRGetMouseStillDownHandler",				QtvrxtraXtra::m_QTVRGetMouseStillDownHandler,		 0, 0,	500 },
-	{ "QTVRSetMouseStillDownHandler",				QtvrxtraXtra::m_QTVRSetMouseStillDownHandler,		 1, 0,	500 },
-	{ "QTVRGetNodeLeaveHandler",				QtvrxtraXtra::m_QTVRGetNodeLeaveHandler,		 0, 0,	500 },
-	{ "QTVRSetNodeLeaveHandler",				QtvrxtraXtra::m_QTVRSetNodeLeaveHandler,		 1, 0,	500 },
-	{ "QTVRGetPanZoomStartHandler",				QtvrxtraXtra::m_QTVRGetPanZoomStartHandler,		 0, 0,	500 },
-	{ "QTVRSetPanZoomStartHandler",				QtvrxtraXtra::m_QTVRSetPanZoomStartHandler,		 1, 0,	500 },
-	{ "QTVRGetRolloverHotSpotHandler",				QtvrxtraXtra::m_QTVRGetRolloverHotSpotHandler,		 0, 0,	500 },
-	{ "QTVRSetRolloverHotSpotHandler",				QtvrxtraXtra::m_QTVRSetRolloverHotSpotHandler,		 1, 0,	500 },
+	{ "QTVRGetColumn",					QtvrxtraXtra::m_QTVRGetColumn,		 0, 0,	500 },
+	{ "QTVRSetColumn",					QtvrxtraXtra::m_QTVRSetColumn,		 1, 1,	500 },
+	{ "QTVRGetRow",						QtvrxtraXtra::m_QTVRGetRow,		 0, 0,	500 },
+	{ "QTVRSetRow",						QtvrxtraXtra::m_QTVRSetRow,		 1, 1,	500 },
+	{ "QTVRNudge",						QtvrxtraXtra::m_QTVRNudge,		 1, 1,	500 },
+	{ "QTVRGetMouseDownHandler",		QtvrxtraXtra::m_QTVRGetMouseDownHandler,		 0, 0,	500 },
+	{ "QTVRSetMouseDownHandler",		QtvrxtraXtra::m_QTVRSetMouseDownHandler,		 1, 0,	500 },
+	{ "QTVRGetMouseOverHandler",		QtvrxtraXtra::m_QTVRGetMouseOverHandler,		 0, 0,	500 },
+	{ "QTVRSetMouseOverHandler",		QtvrxtraXtra::m_QTVRSetMouseOverHandler,		 1, 0,	500 },
+	{ "QTVRGetMouseStillDownHandler",	QtvrxtraXtra::m_QTVRGetMouseStillDownHandler,		 0, 0,	500 },
+	{ "QTVRSetMouseStillDownHandler",	QtvrxtraXtra::m_QTVRSetMouseStillDownHandler,		 1, 0,	500 },
+	{ "QTVRGetNodeLeaveHandler",		QtvrxtraXtra::m_QTVRGetNodeLeaveHandler,		 0, 0,	500 },
+	{ "QTVRSetNodeLeaveHandler",		QtvrxtraXtra::m_QTVRSetNodeLeaveHandler,		 1, 0,	500 },
+	{ "QTVRGetPanZoomStartHandler",		QtvrxtraXtra::m_QTVRGetPanZoomStartHandler,		 0, 0,	500 },
+	{ "QTVRSetPanZoomStartHandler",		QtvrxtraXtra::m_QTVRSetPanZoomStartHandler,		 1, 0,	500 },
+	{ "QTVRGetRolloverHotSpotHandler",	QtvrxtraXtra::m_QTVRGetRolloverHotSpotHandler,		 0, 0,	500 },
+	{ "QTVRSetRolloverHotSpotHandler",	QtvrxtraXtra::m_QTVRSetRolloverHotSpotHandler,		 1, 0,	500 },
 	{ "QTVRExitMouseOver",				QtvrxtraXtra::m_QTVRExitMouseOver,		 0, 0,	500 },
 	{ "QTVRPassMouseDown",				QtvrxtraXtra::m_QTVRPassMouseDown,		 0, 0,	500 },
-	{ "IsQTVRMovie",				QtvrxtraXtra::m_IsQTVRMovie,		 0, 0,	500 },
+	{ "IsQTVRMovie",					QtvrxtraXtra::m_IsQTVRMovie,		 0, 0,	500 },
 	{ nullptr, nullptr, 0, 0, 0 }
 };
 


Commit: 3b5d67cfbdc96c5417d50894927643d99c311205
    https://github.com/scummvm/scummvm/commit/3b5d67cfbdc96c5417d50894927643d99c311205
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2025-02-10T12:19:42+01:00

Commit Message:
DIRECTOR: XTRAS: Stretch QTVR image when needed

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


diff --git a/engines/director/images.cpp b/engines/director/images.cpp
index da7e96e16b2..774c49b0928 100644
--- a/engines/director/images.cpp
+++ b/engines/director/images.cpp
@@ -331,7 +331,7 @@ bool BITDDecoder::loadStream(Common::SeekableReadStream &stream) {
 	return true;
 }
 
-void copyStretchImg(Graphics::Surface *srcSurface, Graphics::Surface *targetSurface, const Common::Rect &srcRect, const Common::Rect &targetRect, const byte *pal) {
+void copyStretchImg(const Graphics::Surface *srcSurface, Graphics::Surface *targetSurface, const Common::Rect &srcRect, const Common::Rect &targetRect, const byte *pal) {
 	if (!(srcSurface) || !(targetSurface))
 		return;
 
diff --git a/engines/director/images.h b/engines/director/images.h
index b64ba8caa25..2445745aa45 100644
--- a/engines/director/images.h
+++ b/engines/director/images.h
@@ -82,7 +82,7 @@ private:
 	uint16 _pitch;
 };
 
-void copyStretchImg(Graphics::Surface *srcSurface, Graphics::Surface *targetSurface, const Common::Rect &srcRect, const Common::Rect &targetRect, const byte *pal = 0);
+void copyStretchImg(const Graphics::Surface *srcSurface, Graphics::Surface *targetSurface, const Common::Rect &srcRect, const Common::Rect &targetRect, const byte *pal = 0);
 
 } // End of namespace Director
 
diff --git a/engines/director/lingo/xtras/qtvrxtra.cpp b/engines/director/lingo/xtras/qtvrxtra.cpp
index f336f1830c1..23930134706 100644
--- a/engines/director/lingo/xtras/qtvrxtra.cpp
+++ b/engines/director/lingo/xtras/qtvrxtra.cpp
@@ -23,6 +23,7 @@
 #include "common/tokenizer.h"
 
 #include "director/director.h"
+#include "director/images.h"
 #include "director/window.h"
 #include "director/lingo/lingo.h"
 #include "director/lingo/lingo-object.h"
@@ -202,8 +203,8 @@ static const MethodProto xlibMethods[] = {
 	{ "QTVRSetTransitionSpeed",			QtvrxtraXtra::m_QTVRSetTransitionSpeed,		 1, 1,	500 },
 	{ "QTVRGetUpdateMode",				QtvrxtraXtra::m_QTVRGetUpdateMode,		 0, 0,	500 },
 	{ "QTVRSetUpdateMode",				QtvrxtraXtra::m_QTVRSetUpdateMode,		 1, 1,	500 },
-		{ "QTVRGetVisible",				QtvrxtraXtra::m_QTVRGetVisible,		 0, 0,	500 },
-		{ "QTVRSetVisible",				QtvrxtraXtra::m_QTVRSetVisible,		 1, 1,	500 },
+	{ "QTVRGetVisible",					QtvrxtraXtra::m_QTVRGetVisible,		 0, 0,	500 },
+	{ "QTVRSetVisible",					QtvrxtraXtra::m_QTVRSetVisible,		 1, 1,	500 },
 	{ "QTVRGetWarpMode",				QtvrxtraXtra::m_QTVRGetWarpMode,		 0, 0,	500 },
 	{ "QTVRSetWarpMode",				QtvrxtraXtra::m_QTVRSetWarpMode,		 1, 0,	500 },
 	{ "QTVRCollapseToHotSpotRgn",		QtvrxtraXtra::m_QTVRCollapseToHotSpotRgn,		 0, 0,	500 },
@@ -240,6 +241,7 @@ QtvrxtraXtraObject::QtvrxtraXtraObject(ObjectType ObjectType) :Object<QtvrxtraXt
 	_objType = ObjectType;
 
 	_video = nullptr;
+	_targetSurface = nullptr;
 
 	_visible = false;
 	_quality = 0.0f;
@@ -372,7 +374,6 @@ void QtvrxtraXtra::m_QTVROpen(int nargs) {
 }
 
 void QtvrxtraXtra::m_QTVRClose(int nargs) {
-	g_lingo->printArgs("QtvrxtraXtra::m_QTVRClose", nargs);
 	ARGNUMCHECK(0);
 
 	QtvrxtraXtraObject *me = (QtvrxtraXtraObject *)g_lingo->_state->me.u.obj;
@@ -384,6 +385,11 @@ void QtvrxtraXtra::m_QTVRClose(int nargs) {
 
 		delete me->_widget;
 	}
+
+	if (me->_targetSurface) {
+		me->_targetSurface->free();
+		delete me->_targetSurface;
+	}
 }
 
 XOBJSTUB(QtvrxtraXtra::m_QTVRUpdate, 0)
@@ -411,16 +417,21 @@ void QtvrxtraXtra::m_QTVRIdle(int nargs) {
 	ARGNUMCHECK(0);
 
 	QtvrxtraXtraObject *me = (QtvrxtraXtraObject *)g_lingo->_state->me.u.obj;
-
 	Graphics::Surface const *frame = me->_video->decodeNextFrame();
-	Graphics::Surface *dither = frame->convertTo(g_director->_wm->_pixelformat, me->_video->getPalette(), 256, g_director->getPalette(), 256, Graphics::kDitherNaive);
+
+	if (!me->_targetSurface) {
+		me->_targetSurface = new Graphics::Surface();
+		me->_targetSurface->create(me->_rect.width(), me->_rect.height(), g_director->_pixelformat);
+	}
+
+	Common::Rect bbox(0, 0, me->_video->getWidth(), me->_video->getHeight());
+
+	copyStretchImg(frame, me->_targetSurface, bbox, me->_rect);
 
 	g_director->getCurrentWindow()->getSurface()->copyRectToSurface(
-			dither->getPixels(), dither->pitch, me->_rect.left, me->_rect.top, dither->w, dither->h
+		me->_targetSurface->getPixels(), me->_targetSurface->pitch,
+		me->_rect.left, me->_rect.top, me->_targetSurface->w, me->_targetSurface->h
 	);
-
-	dither->free();
-	delete dither;
 }
 
 void QtvrxtraXtra::m_QTVRMouseDown(int nargs) {
@@ -771,8 +782,6 @@ void QtvrxtraXtra::m_IsQTVRMovie(int nargs) {
 QtvrxtraWidget::QtvrxtraWidget(QtvrxtraXtraObject *xtra, Graphics::MacWidget *parent, int x, int y, int w, int h, Graphics::MacWindowManager *wm) :
 	Graphics::MacWidget(parent, x, y, w, h, wm, true), _xtra(xtra) {
 
-	warning("****** CREATED at %d, %d, %d, %d", x, y, w, h);
-
 	_priority = 10000; // We stay on top of everything
 }
 
diff --git a/engines/director/lingo/xtras/qtvrxtra.h b/engines/director/lingo/xtras/qtvrxtra.h
index c1cba9d20b6..2954500d2e5 100644
--- a/engines/director/lingo/xtras/qtvrxtra.h
+++ b/engines/director/lingo/xtras/qtvrxtra.h
@@ -46,6 +46,7 @@ public:
 
 	Video::QuickTimeDecoder *_video;
 	QtvrxtraWidget *_widget;
+	Graphics::Surface *_targetSurface;
 
 	Common::Rect _rect;
 	bool _visible;




More information about the Scummvm-git-logs mailing list