commit 9fc58c044c002d8b86c752ea8158661ceac80a00
author Sylvain Becker <sylvain.becker@gmail.com> Tue Apr 02 17:57:27 2019 +0200
committer Sylvain Becker <sylvain.becker@gmail.com> Tue Apr 02 17:57:27 2019 +0200
tree bce934712a71934ca3b2cdcedebc443239e447e6
parent 489c8573c24705952b047a39c44bd28c37b32f42

Bug 4576: fix warning and compile

src/events/SDL_touch.c

diff --git a/src/events/SDL_touch.c b/src/events/SDL_touch.c
index 839ea2e..9c6bbfa 100644
--- a/src/events/SDL_touch.c
+++ b/src/events/SDL_touch.c
@@ -253,8 +253,8 @@
         if (window) {
             if (down) {
                 if (finger_touching == SDL_FALSE) {
-                    int pos_x = x * window->w;
-                    int pos_y = y * window->y;
+                    int pos_x = (int)(x * (float)window->w);
+                    int pos_y = (int)(y * (float)window->y);
                     finger_touching = SDL_TRUE;
                     first_finger = fingerid;
                     SDL_SendMouseMotion(window, SDL_TOUCH_MOUSEID, 0, pos_x, pos_y);
@@ -339,8 +339,8 @@
         SDL_Window *window = SDL_GetMouseFocus();
         if (window) {
             if (finger_touching == SDL_TRUE && first_finger == fingerid) {
-                int pos_x = x * window->w;
-                int pos_y = y * window->y;
+                int pos_x = (int)(x * (float)window->w);
+                int pos_y = (int)(y * (float)window->y);
                 SDL_SendMouseMotion(window, SDL_TOUCH_MOUSEID, 0, pos_x, pos_y);
             }
         }

src/video/android/SDL_androidtouch.c

diff --git a/src/video/android/SDL_androidtouch.c b/src/video/android/SDL_androidtouch.c
index 5d508aa..0e48100 100644
--- a/src/video/android/SDL_androidtouch.c
+++ b/src/video/android/SDL_androidtouch.c
@@ -68,7 +68,6 @@
 {
     SDL_TouchID touchDeviceId = 0;
     SDL_FingerID fingerId = 0;
-    int window_x, window_y;
 
     if (!window) {
         return;

src/video/emscripten/SDL_emscriptenevents.c

diff --git a/src/video/emscripten/SDL_emscriptenevents.c b/src/video/emscripten/SDL_emscriptenevents.c
index 82fef9e..ca13e10 100644
--- a/src/video/emscripten/SDL_emscriptenevents.c
+++ b/src/video/emscripten/SDL_emscriptenevents.c
@@ -431,7 +431,6 @@
 static EM_BOOL
 Emscripten_HandleTouch(int eventType, const EmscriptenTouchEvent *touchEvent, void *userData)
 {
-    SDL_WindowData *window_data = userData;
     int i;
     double client_w, client_h;
     int preventDefault = 0;

src/video/windows/SDL_windowsevents.c

diff --git a/src/video/windows/SDL_windowsevents.c b/src/video/windows/SDL_windowsevents.c
index 3141a8f..62dd949 100644
--- a/src/video/windows/SDL_windowsevents.c
+++ b/src/video/windows/SDL_windowsevents.c
@@ -528,7 +528,7 @@
             SDL_Mouse *mouse = SDL_GetMouse();
             if (!mouse->relative_mode || mouse->relative_mode_warp) {
                 if ((GetMessageExtraInfo() & MOUSEEVENTF_FROMTOUCH) != MOUSEEVENTF_FROMTOUCH) {
-                    WIN_CheckWParamMouseButtons(wParam, data, mouseID);
+                    WIN_CheckWParamMouseButtons(wParam, data, 0);
                 }
             }
         }