[Scummvm-git-logs] scummvm master -> 066bc346efa5ea65f3b562e3397f83ad7666bf9d
lephilousophe
noreply at scummvm.org
Sun Apr 12 15:27:16 UTC 2026
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://api.github.com/repos/scummvm/scummvm .
Summary:
066bc346ef ANDROID: Fix sign compare warnings
Commit: 066bc346efa5ea65f3b562e3397f83ad7666bf9d
https://github.com/scummvm/scummvm/commit/066bc346efa5ea65f3b562e3397f83ad7666bf9d
Author: Le Philousophe (lephilousophe at users.noreply.github.com)
Date: 2026-04-12T17:26:59+02:00
Commit Message:
ANDROID: Fix sign compare warnings
Changed paths:
backends/graphics/android/android-graphics.cpp
backends/platform/android/touchcontrols.cpp
diff --git a/backends/graphics/android/android-graphics.cpp b/backends/graphics/android/android-graphics.cpp
index c8bbfea8e86..805f394583d 100644
--- a/backends/graphics/android/android-graphics.cpp
+++ b/backends/graphics/android/android-graphics.cpp
@@ -265,7 +265,7 @@ void AndroidGraphicsManager::syncVirtkeyboardState(bool virtkeybd_on) {
}
void AndroidGraphicsManager::touchControlInitSurface(const Graphics::ManagedSurface &surf) {
- if (_touchcontrols->getWidth() == surf.w && _touchcontrols->getHeight() == surf.h) {
+ if (_touchcontrols->getWidth() == (uint)surf.w && _touchcontrols->getHeight() == (uint)surf.h) {
return;
}
diff --git a/backends/platform/android/touchcontrols.cpp b/backends/platform/android/touchcontrols.cpp
index 1287d5793be..2d844ad6603 100644
--- a/backends/platform/android/touchcontrols.cpp
+++ b/backends/platform/android/touchcontrols.cpp
@@ -155,8 +155,8 @@ TouchControls::FunctionId TouchControls::getFunctionId(int x, int y) {
// Exclude areas reserved for system
if ((x < JNI::gestures_insets[0] * SCALE_FACTOR_FXP) ||
(y < JNI::gestures_insets[1] * SCALE_FACTOR_FXP) ||
- (x >= _screen_width - JNI::gestures_insets[2] * SCALE_FACTOR_FXP) ||
- (y >= _screen_height - JNI::gestures_insets[3] * SCALE_FACTOR_FXP)) {
+ (x >= (int)_screen_width - JNI::gestures_insets[2] * SCALE_FACTOR_FXP) ||
+ (y >= (int)_screen_height - JNI::gestures_insets[3] * SCALE_FACTOR_FXP)) {
return kFunctionNone;
}
More information about the Scummvm-git-logs
mailing list