flodavid/suyu
1
0
Fork 0
forked from suyu/suyu
Code Pull requests Activity

Explicitly specify LE strings to iconv, fixes paths in Steel Diver

Browse source
This commit is contained in:
archshift 2014-12-09 22:06:53 -08:00
parent a1f9cde806
commit 4763fca9f8
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/common/string_util.cpp
View file

@ -528,7 +528,7 @@ std::u16string UTF8ToUTF16(const std::string& input)
{ {
std::u16string result; std::u16string result;
iconv_t const conv_desc = iconv_open("UTF-16", "UTF-8"); iconv_t const conv_desc = iconv_open("UTF-16LE", "UTF-8");
if ((iconv_t)(-1) == conv_desc) if ((iconv_t)(-1) == conv_desc)
{ {
ERROR_LOG(COMMON, "Iconv initialization failure [UTF-8]: %s", strerror(errno)); ERROR_LOG(COMMON, "Iconv initialization failure [UTF-8]: %s", strerror(errno));
@ -582,7 +582,7 @@ std::u16string UTF8ToUTF16(const std::string& input)
std::string UTF16ToUTF8(const std::u16string& input) std::string UTF16ToUTF8(const std::u16string& input)
{ {
return CodeToUTF8("UTF-16", input); return CodeToUTF8("UTF-16LE", input);
} }
std::string CP1252ToUTF8(const std::string& input) std::string CP1252ToUTF8(const std::string& input)