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

[eriktorbjorn]

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:
d9b4f02d79 SHERLOCK: Silence GCC signed/unsigned warning


Commit: d9b4f02d79f1231cbb890537d1d3db5223bf8d29
    https://github.com/scummvm/scummvm/commit/d9b4f02d79f1231cbb890537d1d3db5223bf8d29
Author: Torbjörn Andersson (eriktorbjorn at users.sourceforge.net)
Date: 2016-02-01T23:20:20+01:00

Commit Message:
SHERLOCK: Silence GCC signed/unsigned warning

Changed paths:
    engines/sherlock/fonts.cpp



diff --git a/engines/sherlock/fonts.cpp b/engines/sherlock/fonts.cpp
index 431159c..8e36c39 100644
--- a/engines/sherlock/fonts.cpp
+++ b/engines/sherlock/fonts.cpp
@@ -130,7 +130,7 @@ void Fonts::setFont(int fontNum) {
 
 	// Iterate through the frames to find the widest and tallest font characters
 	_fontHeight = _widestChar = 0;
-	for (uint idx = 0; idx < MIN((int)_charCount, 128 - 32); ++idx) {
+	for (uint idx = 0; idx < MIN<uint>(_charCount, 128 - 32); ++idx) {
 		_fontHeight = MAX((uint16)_fontHeight, (*_font)[idx]._frame.h);
 		_widestChar = MAX((uint16)_widestChar, (*_font)[idx]._frame.w);
 	}