[Scummvm-cvs-logs] scummvm master -> 27a098cd657350bb8481c19f38c2960a3d876f0d

Strangerke Strangerke at scummvm.org
Wed Feb 26 07:24:58 CET 2014


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:
27a098cd65 VOYEUR: Fix a couple of uninitialized variables in RL2VideoTrack and GraphicsManager


Commit: 27a098cd657350bb8481c19f38c2960a3d876f0d
    https://github.com/scummvm/scummvm/commit/27a098cd657350bb8481c19f38c2960a3d876f0d
Author: Strangerke (strangerke at scummvm.org)
Date: 2014-02-25T22:22:44-08:00

Commit Message:
VOYEUR: Fix a couple of uninitialized variables in RL2VideoTrack and GraphicsManager

Changed paths:
    engines/voyeur/animation.cpp
    engines/voyeur/graphics.cpp



diff --git a/engines/voyeur/animation.cpp b/engines/voyeur/animation.cpp
index 6c0a96f..40ea92f 100644
--- a/engines/voyeur/animation.cpp
+++ b/engines/voyeur/animation.cpp
@@ -227,13 +227,14 @@ RL2Decoder::RL2VideoTrack::RL2VideoTrack(const RL2FileHeader &header, RL2AudioTr
 		Common::SeekableReadStream *stream): 
 		_header(header), _audioTrack(audioTrack), _fileStream(stream) {
 
+	_frameOffsets = nullptr;
+
 	// Set up surfaces
 	_surface = new Graphics::Surface();
 	_surface->create(320, 200, Graphics::PixelFormat::createFormatCLUT8());
+	_backSurface = nullptr;
 
 	_hasBackFrame = header._backSize != 0;
-
-	_backSurface = NULL;
 	if (_hasBackFrame)
 		initBackSurface();
 
diff --git a/engines/voyeur/graphics.cpp b/engines/voyeur/graphics.cpp
index 00f945e..7f944ef 100644
--- a/engines/voyeur/graphics.cpp
+++ b/engines/voyeur/graphics.cpp
@@ -49,6 +49,7 @@ GraphicsManager::GraphicsManager(): _defaultDrawInfo(1, Common::Point()), _drawP
 	_fontPtr = NULL;
 	Common::fill(&_VGAColors[0], &_VGAColors[PALETTE_SIZE], 0);
 	_fontChar = new PictureResource(0, 0xff, 0xff, 0, Common::Rect(), 0, NULL, 0);
+	_backColors = nullptr;
 }
 
 void GraphicsManager::sInitGraphics() {






More information about the Scummvm-git-logs mailing list