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

[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:
2a22c16b91 ANDROID: Stop disabling MT-32 emulator
fbefda8a2f ANDROID: Fix illegal-in-C++11 narrowing conversions


Commit: 2a22c16b916602ee9ced429455add5707b0c4f74
    https://github.com/scummvm/scummvm/commit/2a22c16b916602ee9ced429455add5707b0c4f74
Author: Colin Snover (github.com at zetafleet.com)
Date: 2017-11-25T20:18:57-06:00

Commit Message:
ANDROID: Stop disabling MT-32 emulator

Modern Android CPUs are more than powerful enough to emulate the
MT-32, and users are requesting its support.

Changed paths:
    configure


diff --git a/configure b/configure
index a8716ac..dff0e06 100755
--- a/configure
+++ b/configure
@@ -2826,7 +2826,6 @@ if test -n "$_host"; then
 			_port_mk="backends/platform/android/android.mk"
 			_build_scalers=no
 			_seq_midi=no
-			_mt32emu=no
 			_timidity=no
 			;;
 		androidsdl | androidsdl-armeabi | androidsdl-armeabi-v7a | androidsdl-mips | androidsdl-x86 | androidsdl-arm64-v8a | androidsdl-x86_64)


Commit: fbefda8a2fb7441690b5a47004fc7009c9bc7424
    https://github.com/scummvm/scummvm/commit/fbefda8a2fb7441690b5a47004fc7009c9bc7424
Author: Colin Snover (github.com at zetafleet.com)
Date: 2017-11-25T20:19:01-06:00

Commit Message:
ANDROID: Fix illegal-in-C++11 narrowing conversions

Changed paths:
    backends/platform/android/texture.cpp


diff --git a/backends/platform/android/texture.cpp b/backends/platform/android/texture.cpp
index 165396b..f8c09bf 100644
--- a/backends/platform/android/texture.cpp
+++ b/backends/platform/android/texture.cpp
@@ -185,9 +185,9 @@ void GLESBaseTexture::drawTexture(GLshort x, GLshort y, GLshort w, GLshort h) {
 
 	const GLshort vertices[] = {
 		x, y,
-		x + w, y,
-		x, y + h,
-		x + w, y + h,
+		GLshort(x + w), y,
+		x, GLshort(y + h),
+		GLshort(x + w), GLshort(y + h)
 	};
 
 	GLCALL(glVertexPointer(2, GL_SHORT, 0, vertices));