[Scummvm-cvs-logs] scummvm master -> 694d4edd1595dead62cea18d30da2c52e42be424

[csnover]

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:
694d4edd15 SCI32: Provide default value for vmap minDiffIndex


Commit: 694d4edd1595dead62cea18d30da2c52e42be424
    https://github.com/scummvm/scummvm/commit/694d4edd1595dead62cea18d30da2c52e42be424
Author: Colin Snover (github.com at zetafleet.com)
Date: 2016-05-28T11:02:40-05:00

Commit Message:
SCI32: Provide default value for vmap minDiffIndex

SSCI did not initialise minDiffIndex and would always flow into
the condition that sets it, but some compilers complain that the
value may be used uninitialised, so we will just set it to map
back to its original palette index by default.

Changed paths:
    engines/sci/graphics/frameout.cpp



diff --git a/engines/sci/graphics/frameout.cpp b/engines/sci/graphics/frameout.cpp
index 3903e7b..64ae828 100644
--- a/engines/sci/graphics/frameout.cpp
+++ b/engines/sci/graphics/frameout.cpp
@@ -987,7 +987,7 @@ void GfxFrameout::alterVmap(const Palette &palette1, const Palette &palette2, co
 
 		if (styleRanges[paletteIndex] == style) {
 			int minDiff = 262140;
-			int minDiffIndex;
+			int minDiffIndex = paletteIndex;
 
 			for (int i = 0; i < 236; ++i) {
 				if (styleRanges[i] != style) {
@@ -1007,7 +1007,7 @@ void GfxFrameout::alterVmap(const Palette &palette1, const Palette &palette2, co
 
 		if (style == 1 && styleRanges[paletteIndex] == 0) {
 			int minDiff = 262140;
-			int minDiffIndex;
+			int minDiffIndex = paletteIndex;
 
 			for (int i = 0; i < 236; ++i) {
 				int r = palette2.colors[i].r;