kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Warning cleanup:

Browse Source 
* Comparison in utf detection code always failed
* Cast to integer to silence grumpy 64bit gcc
This commit is contained in:
Antony Riakiotakis 2014-03-22 14:41:38 +02:00
parent 877706b8eb
commit 1206faeb99
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
intern/utfconv/utfconv.c
View File

@ -170,7 +170,7 @@ int conv_utf_8_to_16(const char *in8, wchar_t *out16, size_t size16)
{ {
char u; char u;
char type = 0; char type = 0;
wchar_t u32 = 0; unsigned int u32 = 0;
wchar_t *out16end = out16 + size16; wchar_t *out16end = out16 + size16;
int err = 0; int err = 0;
if (!size16 || !in8 || !out16) return UTF_ERROR_NULL_IN; if (!size16 || !in8 || !out16) return UTF_ERROR_NULL_IN;

2
source/blender/blenlib/intern/path_util.c
View File

@ -2068,7 +2068,7 @@ static void bli_where_am_i(char *fullname, const size_t maxlen, const char *name
if (GetModuleFileNameW(0, fullname_16, maxlen)) { if (GetModuleFileNameW(0, fullname_16, maxlen)) {
conv_utf_16_to_8(fullname_16, fullname, maxlen); conv_utf_16_to_8(fullname_16, fullname, maxlen);
if (!BLI_exists(fullname)) { if (!BLI_exists(fullname)) {
printf("path can't be found: \"%.*s\"\n", maxlen, fullname); printf("path can't be found: \"%.*s\"\n", (int)maxlen, fullname);
MessageBox(NULL, "path contains invalid characters or is too long (see console)", "Error", MB_OK); MessageBox(NULL, "path contains invalid characters or is too long (see console)", "Error", MB_OK);
} }
MEM_freeN(fullname_16); MEM_freeN(fullname_16);