geemili
/
SDL
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Trivial integer truncation warning fixes.

Sam Lantinga 2015-07-30 10:01:04 -07:00
parent 628d8edb95
commit e93f90ae90
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/video/SDL_egl.c
View File

@ -81,7 +81,7 @@ static int SDL_EGL_HasExtension(_THIS, const char *ext)
{ {
int i; int i;
int len = 0; int len = 0;
int ext_len; size_t ext_len;
const char *exts; const char *exts;
const char *ext_word; const char *ext_word;

2
src/video/windows/SDL_windowsevents.c
View File

@ -598,7 +598,7 @@ WIN_WindowProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
case WM_CHAR: case WM_CHAR:
{ {
char text[5]; char text[5];
if ( WIN_ConvertUTF32toUTF8( wParam, text ) ) { if ( WIN_ConvertUTF32toUTF8( (UINT32)wParam, text ) ) {
SDL_SendKeyboardText( text ); SDL_SendKeyboardText( text );
} }
} }

6
src/video/windows/SDL_windowskeyboard.c
View File

@ -738,7 +738,7 @@ IME_SendEditingEvent(SDL_VideoData *videodata)
SDL_wcslcpy(buffer, videodata->ime_composition, size); SDL_wcslcpy(buffer, videodata->ime_composition, size);
} }
s = WIN_StringToUTF8(buffer); 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); SDL_free(s);
} }
@ -1403,7 +1403,7 @@ IME_RenderCandidateList(SDL_VideoData *videodata, HDC hdc)
if (!*s) if (!*s)
break; 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.cx = SDL_max(maxcandsize.cx, candsizes[i].cx);
maxcandsize.cy = SDL_max(maxcandsize.cy, candsizes[i].cy); 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); 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); StopDrawToBitmap(hdc, &hbm);