Android: bypass broken wide_to_utf8 with wide_to_narrow (again)
This bypass had to be re-enabled as some users reported issues, even after the iconv build fix. While utf8_to_wide works well, wide_to_utf8 is quite broken on android, for some reason, and some devices (unrelated from build configuration).
This commit is contained in:
parent
1fadf7f21e
commit
457d42c599
|
@ -102,6 +102,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);
|
||||||
|
@ -128,6 +135,7 @@ std::string wide_to_utf8(const std::wstring &input)
|
||||||
return out;
|
return out;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#endif
|
||||||
#else // _WIN32
|
#else // _WIN32
|
||||||
|
|
||||||
std::wstring utf8_to_wide(const std::string &input)
|
std::wstring utf8_to_wide(const std::string &input)
|
||||||
|
|
Loading…
Reference in New Issue