encounter/SDL
1
0
Fork 0
mirror of https://github.com/encounter/SDL.git synced 2025-12-17 17:05:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix warnings detected on Android build

Browse Source
This commit is contained in:
Sylvain Becker
2018-12-06 09:22:00 +01:00
parent a7563bcd3d
commit 252dc85e95
10 changed files with 22 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/video/SDL_RLEaccel.c
View File

@@ -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);
}

6
src/video/android/SDL_androidmouse.c
View File

@@ -234,7 +234,7 @@ 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;
@@ -242,13 +242,13 @@ Android_OnMouse(int state, int action, float x, float y, SDL_bool relative)
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:

6
src/video/android/SDL_androidvideo.c
View File

@@ -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);

1
src/video/android/SDL_androidvideo.h
View File

@@ -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;