From e93f90ae90421516a21794f08529b700c9f4850a Mon Sep 17 00:00:00 2001 From: Sam Lantinga Date: Thu, 30 Jul 2015 10:01:04 -0700 Subject: [PATCH] Trivial integer truncation warning fixes. --- src/video/SDL_egl.c | 2 +- src/video/windows/SDL_windowsevents.c | 2 +- src/video/windows/SDL_windowskeyboard.c | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/video/SDL_egl.c b/src/video/SDL_egl.c index c7184bd028914..2f53271a4b52b 100644 --- a/src/video/SDL_egl.c +++ b/src/video/SDL_egl.c @@ -81,7 +81,7 @@ static int SDL_EGL_HasExtension(_THIS, const char *ext) { int i; int len = 0; - int ext_len; + size_t ext_len; const char *exts; const char *ext_word; diff --git a/src/video/windows/SDL_windowsevents.c b/src/video/windows/SDL_windowsevents.c index c787f25d0618b..edf9c830c128b 100644 --- a/src/video/windows/SDL_windowsevents.c +++ b/src/video/windows/SDL_windowsevents.c @@ -598,7 +598,7 @@ WIN_WindowProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) case WM_CHAR: { char text[5]; - if ( WIN_ConvertUTF32toUTF8( wParam, text ) ) { + if ( WIN_ConvertUTF32toUTF8( (UINT32)wParam, text ) ) { SDL_SendKeyboardText( text ); } } diff --git a/src/video/windows/SDL_windowskeyboard.c b/src/video/windows/SDL_windowskeyboard.c index 847cba5430751..02f7b630f2db7 100644 --- a/src/video/windows/SDL_windowskeyboard.c +++ b/src/video/windows/SDL_windowskeyboard.c @@ -738,7 +738,7 @@ IME_SendEditingEvent(SDL_VideoData *videodata) SDL_wcslcpy(buffer, videodata->ime_composition, size); } s = WIN_StringToUTF8(buffer); - SDL_SendEditingText(s, videodata->ime_cursor + SDL_wcslen(videodata->ime_readingstring), 0); + SDL_SendEditingText(s, videodata->ime_cursor + (int)SDL_wcslen(videodata->ime_readingstring), 0); SDL_free(s); } @@ -1403,7 +1403,7 @@ IME_RenderCandidateList(SDL_VideoData *videodata, HDC hdc) if (!*s) break; - GetTextExtentPoint32W(hdc, s, SDL_wcslen(s), &candsizes[i]); + GetTextExtentPoint32W(hdc, s, (int)SDL_wcslen(s), &candsizes[i]); maxcandsize.cx = SDL_max(maxcandsize.cx, candsizes[i].cx); maxcandsize.cy = SDL_max(maxcandsize.cy, candsizes[i].cy); @@ -1495,7 +1495,7 @@ IME_RenderCandidateList(SDL_VideoData *videodata, HDC hdc) } DrawRect(hdc, left, top, right, bottom, candborder); - ExtTextOutW(hdc, left + candborder + candpadding, top + candborder + candpadding, 0, NULL, s, SDL_wcslen(s), NULL); + ExtTextOutW(hdc, left + candborder + candpadding, top + candborder + candpadding, 0, NULL, s, (int)SDL_wcslen(s), NULL); } StopDrawToBitmap(hdc, &hbm);