Skip to content
Permalink
Browse files
Fix warnings detected on Android build
  • Loading branch information
1bsyl committed Dec 6, 2018
1 parent a7563bc commit 252dc85e95892fe54e4991fb70f60c8f5a1389bb
@@ -545,7 +545,7 @@ SDL_SendMouseWheel(SDL_Window * window, SDL_MouseID mouseID, float x, float y, S
SDL_SetMouseFocus(window);
}

if (!x && !y) {
if (x == 0. && y == 0.) {
return 0;
}

@@ -315,7 +315,7 @@ SDL_SendTouchMotion(SDL_TouchID id, SDL_FingerID fingerid,
prel = pressure - finger->pressure;

/* Drop events that don't change state */
if (!xrel && !yrel && !prel) {
if (xrel == 0. && yrel == 0. && prel == 0.) {
#if 0
printf("Touch event didn't change state - dropped!\n");
#endif
@@ -26,7 +26,11 @@
#include "SDL_assert.h"

/* Global for SDL_windowshaptic.c */
#if (defined(SDL_HAPTIC_DINPUT) && SDL_HAPTIC_DINPUT) || (defined(SDL_HAPTIC_XINPUT) && SDL_HAPTIC_XINPUT)
SDL_Haptic *SDL_haptics = NULL;
#else
static SDL_Haptic *SDL_haptics = NULL;
#endif

/*
* Initializes the Haptic devices.
@@ -2415,17 +2415,17 @@ RenderDrawLinesWithRectsF(SDL_Renderer * renderer,

for (i = 0; i < count-1; ++i) {
if (points[i].x == points[i+1].x) {
const int minY = SDL_min(points[i].y, points[i+1].y);
const int maxY = SDL_max(points[i].y, points[i+1].y);
const int minY = (int)SDL_min(points[i].y, points[i+1].y);
const int maxY = (int)SDL_max(points[i].y, points[i+1].y);

frect = &frects[nrects++];
frect->x = points[i].x * renderer->scale.x;
frect->y = minY * renderer->scale.y;
frect->w = renderer->scale.x;
frect->h = (maxY - minY + 1) * renderer->scale.y;
} else if (points[i].y == points[i+1].y) {
const int minX = SDL_min(points[i].x, points[i+1].x);
const int maxX = SDL_max(points[i].x, points[i+1].x);
const int minX = (int)SDL_min(points[i].x, points[i+1].x);
const int maxX = (int)SDL_max(points[i].x, points[i+1].x);

frect = &frects[nrects++];
frect->x = minX * renderer->scale.x;
@@ -999,7 +999,7 @@ SDLTest_CommonInit(SDLTest_CommonState * state)
}
if (state->logical_w && state->logical_h) {
SDL_RenderSetLogicalSize(state->renderers[i], state->logical_w, state->logical_h);
} else if (state->scale) {
} else if (state->scale != 0.) {
SDL_RenderSetScale(state->renderers[i], state->scale, state->scale);
}
if (state->verbose & VERBOSE_RENDER) {
@@ -50,7 +50,6 @@
#include "SDL_log.h"
#include "SDL_platform.h"
#include "SDL_thread.h"
#include "SDL_system.h"
#include "../SDL_thread_c.h"
#include "../SDL_systhread.h"
#ifdef __ANDROID__
@@ -1510,8 +1510,9 @@ UnRLEAlpha(SDL_Surface * surface)
if (run) {
srcbuf += uncopy_opaque(dst + ofs, srcbuf, run, df, sf);
ofs += run;
} else if (!ofs)
return (SDL_TRUE);
} else if (!ofs) {
goto end_function;
}
} while (ofs < w);

/* skip padding if needed */
@@ -1532,7 +1533,8 @@ UnRLEAlpha(SDL_Surface * surface)
} while (ofs < w);
dst += surface->pitch >> 2;
}
/* Make the compiler happy */

end_function:
return (SDL_TRUE);
}

@@ -234,21 +234,21 @@ Android_OnMouse(int state, int action, float x, float y, SDL_bool relative)
changes = state & ~last_state;
button = TranslateButton(changes);
last_state = state;
SDL_SendMouseMotion(Android_Window, 0, relative, x, y);
SDL_SendMouseMotion(Android_Window, 0, relative, (int)x, (int)y);
SDL_SendMouseButton(Android_Window, 0, SDL_PRESSED, button);
break;

case ACTION_UP:
changes = last_state & ~state;
button = TranslateButton(changes);
last_state = state;
SDL_SendMouseMotion(Android_Window, 0, relative, x, y);
SDL_SendMouseMotion(Android_Window, 0, relative, (int)x, (int)y);
SDL_SendMouseButton(Android_Window, 0, SDL_RELEASED, button);
break;

case ACTION_MOVE:
case ACTION_HOVER_MOVE:
SDL_SendMouseMotion(Android_Window, 0, relative, x, y);
SDL_SendMouseMotion(Android_Window, 0, relative, (int)x, (int)y);
break;

case ACTION_SCROLL:
@@ -64,7 +64,7 @@ int Android_SurfaceWidth = 0;
int Android_SurfaceHeight = 0;
int Android_DeviceWidth = 0;
int Android_DeviceHeight = 0;
Uint32 Android_ScreenFormat = SDL_PIXELFORMAT_UNKNOWN;
static Uint32 Android_ScreenFormat = SDL_PIXELFORMAT_UNKNOWN;
static int Android_ScreenRate = 0;

SDL_sem *Android_PauseSem = NULL, *Android_ResumeSem = NULL;
@@ -221,7 +221,7 @@ Android_SetScreenResolution(int surfaceWidth, int surfaceHeight, int deviceWidth
Android_DeviceWidth = deviceWidth;
Android_DeviceHeight = deviceHeight;
Android_ScreenFormat = format;
Android_ScreenRate = rate;
Android_ScreenRate = (int)rate;

/*
Update the resolution of the desktop mode, so that the window
@@ -247,7 +247,7 @@ Android_SetScreenResolution(int surfaceWidth, int surfaceHeight, int deviceWidth
display->display_modes[0].format = format;
display->display_modes[0].w = Android_DeviceWidth;
display->display_modes[0].h = Android_DeviceHeight;
display->display_modes[0].refresh_rate = rate;
display->display_modes[0].refresh_rate = (int)rate;
display->current_mode = display->display_modes[0];

SDL_SendWindowEvent(Android_Window, SDL_WINDOWEVENT_RESIZED, surfaceWidth, surfaceHeight);
@@ -41,7 +41,6 @@ extern int Android_SurfaceWidth;
extern int Android_SurfaceHeight;
extern int Android_DeviceWidth;
extern int Android_DeviceHeight;
extern Uint32 Android_ScreenFormat;
extern SDL_sem *Android_PauseSem, *Android_ResumeSem;
extern SDL_Window *Android_Window;

0 comments on commit 252dc85

Please sign in to comment.