[Scummvm-cvs-logs] scummvm master -> 199425562e4a6e81d66adc41dfc2a5b78d2f0b47

[somaen]

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:
17809d0fb3 WINTERMUTE: Delete the _dirtyRect-field of BaseRenderOSystem in the destructor.
58777682fe GRAPHICS: Fix leak in PNG-decoder.
199425562e WINTERMUTE: Fix a leak in sound-file loading.


Commit: 17809d0fb313d9ebae6491d0888432d182c13f30
    https://github.com/scummvm/scummvm/commit/17809d0fb313d9ebae6491d0888432d182c13f30
Author: Einar Johan Trøan Sømåen (einarjohants at gmail.com)
Date: 2013-01-24T08:27:50-08:00

Commit Message:
WINTERMUTE: Delete the _dirtyRect-field of BaseRenderOSystem in the destructor.

Changed paths:
    engines/wintermute/base/gfx/osystem/base_render_osystem.cpp



diff --git a/engines/wintermute/base/gfx/osystem/base_render_osystem.cpp b/engines/wintermute/base/gfx/osystem/base_render_osystem.cpp
index fb0cb78..a5b251c 100644
--- a/engines/wintermute/base/gfx/osystem/base_render_osystem.cpp
+++ b/engines/wintermute/base/gfx/osystem/base_render_osystem.cpp
@@ -76,6 +76,8 @@ BaseRenderOSystem::~BaseRenderOSystem() {
 		delete ticket;
 	}
 
+	delete _dirtyRect;
+
 	_renderSurface->free();
 	delete _renderSurface;
 	_blankSurface->free();


Commit: 58777682feab173ddcbec4ccab5e01be40b7ca29
    https://github.com/scummvm/scummvm/commit/58777682feab173ddcbec4ccab5e01be40b7ca29
Author: Einar Johan Trøan Sømåen (einarjohants at gmail.com)
Date: 2013-01-24T08:39:16-08:00

Commit Message:
GRAPHICS: Fix leak in PNG-decoder.

Changed paths:
    graphics/decoders/png.cpp



diff --git a/graphics/decoders/png.cpp b/graphics/decoders/png.cpp
index 4f917b4..11e2616 100644
--- a/graphics/decoders/png.cpp
+++ b/graphics/decoders/png.cpp
@@ -227,7 +227,7 @@ bool PNGDecoder::loadStream(Common::SeekableReadStream &stream) {
 	png_read_end(pngPtr, NULL);
 
 	// Destroy libpng structures
-	png_destroy_read_struct(&pngPtr, &infoPtr, NULL);
+	png_destroy_read_struct(&pngPtr, &infoPtr, &endInfo);
 
 	// We no longer need the file stream, thus close it here
 	_stream = 0;


Commit: 199425562e4a6e81d66adc41dfc2a5b78d2f0b47
    https://github.com/scummvm/scummvm/commit/199425562e4a6e81d66adc41dfc2a5b78d2f0b47
Author: Einar Johan Trøan Sømåen (einarjohants at gmail.com)
Date: 2013-01-24T08:49:24-08:00

Commit Message:
WINTERMUTE: Fix a leak in sound-file loading.

Changed paths:
    engines/wintermute/base/sound/base_sound_buffer.cpp



diff --git a/engines/wintermute/base/sound/base_sound_buffer.cpp b/engines/wintermute/base/sound/base_sound_buffer.cpp
index e8f4fce..d2b265a 100644
--- a/engines/wintermute/base/sound/base_sound_buffer.cpp
+++ b/engines/wintermute/base/sound/base_sound_buffer.cpp
@@ -111,7 +111,7 @@ bool BaseSoundBuffer::loadFromFile(const Common::String &filename, bool forceRel
 		if (Audio::loadWAVFromStream(*_file, waveSize, waveRate, waveFlags, &waveType)) {
 			if (waveType == 1) {
 				// We need to wrap the file in a substream to make sure the size is right.
-				_file = new Common::SeekableSubReadStream(_file, _file->pos(), waveSize + _file->pos());
+				_file = new Common::SeekableSubReadStream(_file, _file->pos(), waveSize + _file->pos(), DisposeAfterUse::YES);
 				_stream = Audio::makeRawStream(_file, waveRate, waveFlags, DisposeAfterUse::YES);
 			} else {
 				error("BSoundBuffer::LoadFromFile - WAVE not supported yet for %s with type %d", filename.c_str(), waveType);