[Scummvm-cvs-logs] scummvm master -> a8896be85ea332c0f5d6c7009e4f6e70133d1f6f

[fuzzie]

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:
62a22b6293 COMPOSER: Fix a warning and an uninitialized value.
a8896be85e COMMON: Initialize more z_stream fields before calling inflateInit2.


Commit: 62a22b62931fc43705a9bf62383e58896b53ddb4
    https://github.com/scummvm/scummvm/commit/62a22b62931fc43705a9bf62383e58896b53ddb4
Author: Alyssa Milburn (fuzzie at fuzzie.org)
Date: 2011-08-04T12:50:17-07:00

Commit Message:
COMPOSER: Fix a warning and an uninitialized value.

Changed paths:
    engines/composer/graphics.cpp
    engines/composer/resource.cpp



diff --git a/engines/composer/graphics.cpp b/engines/composer/graphics.cpp
index 3de2449..5c9fc6e 100644
--- a/engines/composer/graphics.cpp
+++ b/engines/composer/graphics.cpp
@@ -506,7 +506,7 @@ void ComposerEngine::loadCTBL(uint16 id, uint fadePercent) {
 	stream->read(buffer, numEntries * 3);
 	delete stream;
 
-	for (uint i = 0; i < numEntries * 3; i++)
+	for (uint16 i = 0; i < numEntries * 3; i++)
 		buffer[i] = ((unsigned int)buffer[i] * fadePercent) / 100;
 
 	_system->getPaletteManager()->setPalette(buffer, 0, numEntries);
diff --git a/engines/composer/resource.cpp b/engines/composer/resource.cpp
index e089338..b40bdb3 100644
--- a/engines/composer/resource.cpp
+++ b/engines/composer/resource.cpp
@@ -251,6 +251,7 @@ bool ComposerArchive::openStream(Common::SeekableReadStream *stream) {
 Pipe::Pipe(Common::SeekableReadStream *stream) {
 	_offset = 0;
 	_stream = stream;
+	_anim = NULL;
 
 	nextFrame();
 }


Commit: a8896be85ea332c0f5d6c7009e4f6e70133d1f6f
    https://github.com/scummvm/scummvm/commit/a8896be85ea332c0f5d6c7009e4f6e70133d1f6f
Author: Alyssa Milburn (fuzzie at fuzzie.org)
Date: 2011-08-04T12:55:28-07:00

Commit Message:
COMMON: Initialize more z_stream fields before calling inflateInit2.

The zlib documentation and examples claim this is needed, as spotted
by LordHoto.

Changed paths:
    common/zlib.cpp



diff --git a/common/zlib.cpp b/common/zlib.cpp
index b047586..71a25bd 100644
--- a/common/zlib.cpp
+++ b/common/zlib.cpp
@@ -76,6 +76,8 @@ public:
 		_stream.zalloc = Z_NULL;
 		_stream.zfree = Z_NULL;
 		_stream.opaque = Z_NULL;
+		_stream.avail_in = 0;
+		_stream.next_in = Z_NULL;
 
 		// Verify file header is correct
 		w->seek(0, SEEK_SET);