[Scummvm-git-logs] scummvm master -> fbd1e87824625edad2c1a0040fc9793c3be88b51

[digitall]

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:
3c947754ac WAGE: Fix GCC Compiler Warnings.
fbd1e87824 GRAPHICS: MACGUI: Fix GCC Compiler Warnings.


Commit: 3c947754acd62e75c5459f124404d0f6c009abd3
    https://github.com/scummvm/scummvm/commit/3c947754acd62e75c5459f124404d0f6c009abd3
Author: D G Turner (digitall at scummvm.org)
Date: 2017-08-11T00:55:46+01:00

Commit Message:
WAGE: Fix GCC Compiler Warnings.

Changed paths:
    engines/wage/sound.cpp


diff --git a/engines/wage/sound.cpp b/engines/wage/sound.cpp
index dcc33a2..fd6adae 100644
--- a/engines/wage/sound.cpp
+++ b/engines/wage/sound.cpp
@@ -66,7 +66,7 @@ Sound::Sound(Common::String name, Common::SeekableReadStream *data) : _name(name
 	data->skip(20); // Skip header
 
 	byte value = 0x80;
-	for (int i = 0; i < _size; i++) {
+	for (uint i = 0; i < _size; i++) {
 		byte d = data->readByte();
 		value += deltas[d & 0xf];
 		_data[i * 2] = value;


Commit: fbd1e87824625edad2c1a0040fc9793c3be88b51
    https://github.com/scummvm/scummvm/commit/fbd1e87824625edad2c1a0040fc9793c3be88b51
Author: D G Turner (digitall at scummvm.org)
Date: 2017-08-11T00:56:28+01:00

Commit Message:
GRAPHICS: MACGUI: Fix GCC Compiler Warnings.

Changed paths:
    graphics/macgui/mactextwindow.cpp


diff --git a/graphics/macgui/mactextwindow.cpp b/graphics/macgui/mactextwindow.cpp
index 5f3d01e..6fc9cab 100644
--- a/graphics/macgui/mactextwindow.cpp
+++ b/graphics/macgui/mactextwindow.cpp
@@ -324,8 +324,8 @@ bool MacTextWindow::processEvent(Common::Event &event) {
 
 					bool cutAllowed = false;
 
-					if (_selectedText.startRow >= _mactext->getLineCount() - _inputTextHeight &&
-							_selectedText.endRow  >= _mactext->getLineCount() - _inputTextHeight)
+					if (_selectedText.startRow >= (int)(_mactext->getLineCount() - _inputTextHeight) &&
+							_selectedText.endRow  >= (int)(_mactext->getLineCount() - _inputTextHeight))
 						cutAllowed = true;
 
 					_menu->enableCommand("Edit", "Cut", cutAllowed);