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

Android: bypass broken wide_to_utf8 with wide_to_narrow 

While utf8_to_wide works well, wide_to_utf8 is quite broken
on android, for some reason.
master
est31 2015-06-14 06:38:02 +02:00
parent b6387b4e0f
commit 60f31ad523
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/util/string.cpp
View File

@ -83,6 +83,13 @@ std::wstring utf8_to_wide(const std::string &input)
return out; return out;
} }
#ifdef __ANDROID__
// TODO: this is an ugly fix for wide_to_utf8 somehow not working on android
std::string wide_to_utf8(const std::wstring &input)
{
return wide_to_narrow(input);
}
#else
std::string wide_to_utf8(const std::wstring &input) std::string wide_to_utf8(const std::wstring &input)
{ {
size_t inbuf_size = (input.length() + 1) * sizeof(wchar_t); size_t inbuf_size = (input.length() + 1) * sizeof(wchar_t);
@ -102,6 +109,7 @@ std::string wide_to_utf8(const std::wstring &input)
return out; return out;
} }
#endif
#else #else
std::wstring utf8_to_wide(const std::string &input) std::wstring utf8_to_wide(const std::string &input)
{ {
@ -126,7 +134,6 @@ std::string wide_to_utf8(const std::wstring &input)
} }
#endif #endif
// You must free the returned string! // You must free the returned string!
// The returned string is allocated using new // The returned string is allocated using new
wchar_t *narrow_to_wide_c(const char *str) wchar_t *narrow_to_wide_c(const char *str)