[Scummvm-git-logs] scummvm master -> 1b4226ce904060f17ac3f8636799fe3b88008fa9

[sev-]

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:
bb62c305c3 DIRECTOR: Cleanup of transitions code
3975bca256 DIRECTOR: Added stub for changed area transitions
1b4226ce90 DIRECTOR: Plugged memory leak it BITDDecoder


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

Commit Message:
DIRECTOR: Cleanup of transitions code

Changed paths:
    engines/director/transitions.cpp


diff --git a/engines/director/transitions.cpp b/engines/director/transitions.cpp
index 13eb85a960..9bd185924d 100644
--- a/engines/director/transitions.cpp
+++ b/engines/director/transitions.cpp
@@ -36,9 +36,9 @@ namespace Director {
 enum TransitionAlgo {
 	kTransAlgoBlinds,
 	kTransAlgoBoxy,
-	kTransAlgoBuildStrips,
+	kTransAlgoStrips,
 	kTransAlgoCenterOut,
-	kTransAlgoCheckerBoard,
+	kTransAlgoChecker,
 	kTransAlgoCover,
 	kTransAlgoDissolve,
 	kTransAlgoEdgesIn,
@@ -112,16 +112,16 @@ struct {
 	TRANS(kTransCoverUp,				kTransAlgoCover,	kTransDirVertical),
 	TRANS(kTransCoverUpLeft,			kTransAlgoCover,	kTransDirBoth),			// 35
 	TRANS(kTransCoverUpRight,			kTransAlgoCover,	kTransDirBoth),
-	TRANS(kTransVenetianBlind,		kTransAlgoBlinds,	kTransDirBlindsH),
-	TRANS(kTransCheckerboard,		kTransAlgoCheckerBoard, kTransDirCheckers),
-	TRANS(kTransStripsBottomBuildLeft, kTransAlgoBuildStrips, kTransDirStepsV),
-	TRANS(kTransStripsBottomBuildRight, kTransAlgoBuildStrips, kTransDirStepsV),	// 40
-	TRANS(kTransStripsLeftBuildDown, kTransAlgoBuildStrips, kTransDirStepsH),
-	TRANS(kTransStripsLeftBuildUp, kTransAlgoBuildStrips, kTransDirStepsH),
-	TRANS(kTransStripsRightBuildDown, kTransAlgoBuildStrips, kTransDirStepsH),
-	TRANS(kTransStripsRightBuildUp, kTransAlgoBuildStrips, kTransDirStepsH),
-	TRANS(kTransStripsTopBuildLeft,	kTransAlgoBuildStrips, kTransDirStepsV),		// 45
-	TRANS(kTransStripsTopBuildRight, kTransAlgoBuildStrips, kTransDirStepsV),
+	TRANS(kTransVenetianBlind,			kTransAlgoBlinds,	kTransDirBlindsH),
+	TRANS(kTransCheckerboard,			kTransAlgoChecker,	kTransDirCheckers),
+	TRANS(kTransStripsBottomBuildLeft, 	kTransAlgoStrips,	kTransDirStepsV),
+	TRANS(kTransStripsBottomBuildRight,	kTransAlgoStrips,	kTransDirStepsV),		// 40
+	TRANS(kTransStripsLeftBuildDown, 	kTransAlgoStrips,	kTransDirStepsH),
+	TRANS(kTransStripsLeftBuildUp,		kTransAlgoStrips,	kTransDirStepsH),
+	TRANS(kTransStripsRightBuildDown,	kTransAlgoStrips,	kTransDirStepsH),
+	TRANS(kTransStripsRightBuildUp,		kTransAlgoStrips,	kTransDirStepsH),
+	TRANS(kTransStripsTopBuildLeft,		kTransAlgoStrips,	kTransDirStepsV),		// 45
+	TRANS(kTransStripsTopBuildRight,	kTransAlgoStrips,	kTransDirStepsV),
 	TRANS(kTransZoomOpen,				kTransAlgoZoom,		kTransDirBoth),
 	TRANS(kTransZoomClose,				kTransAlgoZoom,		kTransDirBoth),
 	TRANS(kTransVerticalBinds,			kTransAlgoBlinds,	kTransDirBlindsV),
@@ -189,8 +189,8 @@ void Frame::playTransition(Score *score) {
 			dissolveTrans(t, score, clipRect);
 		return;
 
-	case kTransAlgoCheckerBoard:
-	case kTransAlgoBuildStrips:
+	case kTransAlgoChecker:
+	case kTransAlgoStrips:
 	case kTransAlgoBlinds:
 		transMultiPass(t, score, clipRect);
 		return;


Commit: 3975bca256622fdca25acf1c5a3d8069c6217ac8
    https://github.com/scummvm/scummvm/commit/3975bca256622fdca25acf1c5a3d8069c6217ac8
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-04-02T13:58:04+02:00

Commit Message:
DIRECTOR: Added stub for changed area transitions

Changed paths:
    engines/director/transitions.cpp


diff --git a/engines/director/transitions.cpp b/engines/director/transitions.cpp
index 9bd185924d..8d5141ea6e 100644
--- a/engines/director/transitions.cpp
+++ b/engines/director/transitions.cpp
@@ -171,6 +171,9 @@ void Frame::playTransition(Score *score) {
 	t.duration = MAX<uint16>(250, _transDuration); // When duration is < 1/4s, make it 1/4
 	t.chunkSize = MAX<uint>(1, _transChunkSize);
 
+	if (_transArea)
+		warning("STUB: Changed area transition");
+
 	Common::Rect clipRect(score->_movieRect);
 	clipRect.moveTo(0, 0);
 


Commit: 1b4226ce904060f17ac3f8636799fe3b88008fa9
    https://github.com/scummvm/scummvm/commit/1b4226ce904060f17ac3f8636799fe3b88008fa9
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-04-02T13:58:04+02:00

Commit Message:
DIRECTOR: Plugged memory leak it BITDDecoder

Changed paths:
    engines/director/images.cpp


diff --git a/engines/director/images.cpp b/engines/director/images.cpp
index 5e4f4b263d..7e65d3aa2c 100644
--- a/engines/director/images.cpp
+++ b/engines/director/images.cpp
@@ -40,8 +40,7 @@ DIBDecoder::~DIBDecoder() {
 }
 
 void DIBDecoder::destroy() {
-	delete _surface;
-	_surface = 0;
+	_surface = 0;	// It is deleted by BitmapRawDecoder
 
 	delete[] _palette;
 	_palette = 0;
@@ -149,6 +148,7 @@ BITDDecoder::~BITDDecoder() {
 }
 
 void BITDDecoder::destroy() {
+	_surface->free();
 	delete _surface;
 	_surface = 0;