Commit b45abbb2a758dde64a725a9fc588f32daa10f620
2019-04-02T17:57:27
Bug 4576: fix warning and compile
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63
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 @@ SDL_SendTouch(SDL_TouchID id, SDL_FingerID fingerid,
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_SendTouchMotion(SDL_TouchID id, SDL_FingerID fingerid,
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);
}
}
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 @@ void Android_OnTouch(SDL_Window *window, int touch_device_id_in, int pointer_fin
{
SDL_TouchID touchDeviceId = 0;
SDL_FingerID fingerId = 0;
- int window_x, window_y;
if (!window) {
return;
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 @@ Emscripten_HandleFocus(int eventType, const EmscriptenFocusEvent *wheelEvent, vo
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;
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 @@ WIN_WindowProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
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);
}
}
}