[Scummvm-cvs-logs] scummvm master -> 97b3437f499db5e50aa97d3085c26b1c98ea9d5f

[csnover]

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:
beba350baa SCI32: Fix cast warnings
97b3437f49 CREATE_PROJECT: Fix warning flags in Xcode generator


Commit: beba350baa4295b08afa72419e1fb77cadbd274c
    https://github.com/scummvm/scummvm/commit/beba350baa4295b08afa72419e1fb77cadbd274c
Author: Colin Snover (github.com at zetafleet.com)
Date: 2016-08-13T16:33:14-05:00

Commit Message:
SCI32: Fix cast warnings

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



diff --git a/engines/sci/graphics/video32.cpp b/engines/sci/graphics/video32.cpp
index 757d793..51be08d 100644
--- a/engines/sci/graphics/video32.cpp
+++ b/engines/sci/graphics/video32.cpp
@@ -372,8 +372,8 @@ void AVIPlayer::renderFrame() const {
 		// to always be white
 		if (getSciVersion() == SCI_VERSION_2_1_EARLY && g_sci->getGameId() == GID_KQ7) {
 			uint8 *target = bitmap.getPixels();
-			uint8 *source = (uint8 *)surface->getPixels();
-			uint8 *end = (uint8 *)surface->getPixels() + surface->w * surface->h;
+			const uint8 *source = (const uint8 *)surface->getPixels();
+			const uint8 *end = (const uint8 *)surface->getPixels() + surface->w * surface->h;
 
 			while (source != end) {
 				uint8 value = *source++;
@@ -409,7 +409,7 @@ void AVIPlayer::renderFrame() const {
 		Common::Rect drawRect(_drawRect);
 
 		if (_pixelDouble) {
-			const uint32 *source = (uint32 *)surface->getPixels();
+			const uint32 *source = (const uint32 *)surface->getPixels();
 			uint32 *target = (uint32 *)_scaleBuffer;
 			// target pitch here is in uint32s, not bytes
 			const uint16 pitch = surface->pitch / 2;


Commit: 97b3437f499db5e50aa97d3085c26b1c98ea9d5f
    https://github.com/scummvm/scummvm/commit/97b3437f499db5e50aa97d3085c26b1c98ea9d5f
Author: Colin Snover (github.com at zetafleet.com)
Date: 2016-08-13T16:34:28-05:00

Commit Message:
CREATE_PROJECT: Fix warning flags in Xcode generator

Sign comparison should be on to match other compilers, and
multichar warnings should be disabled for all platforms, not just
iOS.

Changed paths:
    devtools/create_project/xcode.cpp



diff --git a/devtools/create_project/xcode.cpp b/devtools/create_project/xcode.cpp
index 62969d1..07dc24e 100644
--- a/devtools/create_project/xcode.cpp
+++ b/devtools/create_project/xcode.cpp
@@ -786,6 +786,8 @@ void XcodeProvider::setupBuildConfiguration(const BuildSetup &setup) {
 	ADD_SETTING(scummvm_Debug, "GCC_ENABLE_CPP_RTTI", "YES");
 	ADD_SETTING(scummvm_Debug, "GCC_INPUT_FILETYPE", "automatic");
 	ADD_SETTING(scummvm_Debug, "GCC_OPTIMIZATION_LEVEL", "0");
+	ADD_SETTING(scummvm_Debug, "GCC_WARN_SIGN_COMPARE", "YES");
+	ADD_SETTING(scummvm_Debug, "WARNING_CFLAGS", "-Wno-multichar");
 	ValueList scummvm_defines(_defines);
 	REMOVE_DEFINE(scummvm_defines, "MACOSX");
 	REMOVE_DEFINE(scummvm_defines, "IPHONE");
@@ -844,7 +846,6 @@ void XcodeProvider::setupBuildConfiguration(const BuildSetup &setup) {
 	ADD_SETTING(iPhone_Debug, "GCC_OPTIMIZATION_LEVEL", "0");
 	ADD_SETTING(iPhone_Debug, "GCC_PRECOMPILE_PREFIX_HEADER", "NO");
 	ADD_SETTING(iPhone_Debug, "GCC_WARN_64_TO_32_BIT_CONVERSION", "NO");
-	ADD_SETTING(iPhone_Debug, "WARNING_CFLAGS", "-Wno-multichar");
 	ADD_SETTING_QUOTE(iPhone_Debug, "GCC_PREFIX_HEADER", "");
 	ADD_SETTING(iPhone_Debug, "GCC_UNROLL_LOOPS", "YES");
 	ValueList iPhone_HeaderSearchPaths;