[Scummvm-git-logs] scummvm master -> 3185ca49571389023197c83f7539daf67f1f5f59

[dreammaster]

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:
97daed7456 TITANIC: Fix compiler warnings
3185ca4957 GRAPHICS: Fix compiler warning in BdfFont


Commit: 97daed745631aa929b416db9cfc0643357839bd8
    https://github.com/scummvm/scummvm/commit/97daed745631aa929b416db9cfc0643357839bd8
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2016-10-31T19:37:53-04:00

Commit Message:
TITANIC: Fix compiler warnings

Changed paths:
    engines/titanic/true_talk/tt_concept.cpp



diff --git a/engines/titanic/true_talk/tt_concept.cpp b/engines/titanic/true_talk/tt_concept.cpp
index 9aad887..b8204ba 100644
--- a/engines/titanic/true_talk/tt_concept.cpp
+++ b/engines/titanic/true_talk/tt_concept.cpp
@@ -213,11 +213,9 @@ void TTconcept::copyFrom(TTconcept *src) {
 }
 
 int TTconcept::setOwner(TTconcept *src) {
-	if (this) {
-		if (src->_wordP) {
-			TTword *newWord = src->_wordP->copy();
-			return setOwner(newWord, 1);
-		}
+	if (src->_wordP) {
+		TTword *newWord = src->_wordP->copy();
+		return setOwner(newWord, 1);
 	}
 
 	return 0;
@@ -302,7 +300,7 @@ bool TTconcept::isWordId(int id) const {
 }
 
 int TTconcept::getWordId() const {
-	return this && _wordP ? _wordP->_id : 0;
+	return _wordP ? _wordP->_id : 0;
 }
 
 } // End of namespace Titanic


Commit: 3185ca49571389023197c83f7539daf67f1f5f59
    https://github.com/scummvm/scummvm/commit/3185ca49571389023197c83f7539daf67f1f5f59
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2016-10-31T19:39:00-04:00

Commit Message:
GRAPHICS: Fix compiler warning in BdfFont

Changed paths:
    graphics/fonts/bdf.cpp



diff --git a/graphics/fonts/bdf.cpp b/graphics/fonts/bdf.cpp
index fec5392..511ea5c 100644
--- a/graphics/fonts/bdf.cpp
+++ b/graphics/fonts/bdf.cpp
@@ -759,7 +759,7 @@ BdfFont *BdfFont::scaleFont(BdfFont *src, int newSize) {
 			byte *ptr = bitmaps[i];
 
 			for (int y = 0; y < box.height; y++) {
-				byte *srcd = (byte *)&src->_data.bitmaps[i][((int)((float)y / scale)) * srcPitch];
+				const byte *srcd = (const byte *)&src->_data.bitmaps[i][((int)((float)y / scale)) * srcPitch];
 				byte *dst = ptr;
 				byte b = 0;