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

Merge pull request #269 from archshift/le 

Explicitly specify LE strings to iconv, fixes paths in Steel Diver
This commit is contained in:
bunnei 2014-12-10 01:18:28 -05:00
parent a1f9cde806 4763fca9f8
commit a50acb40b8
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)