diff options
| author | archshift <admin@archshift.com> | 2014-12-09 22:06:53 -0800 |
|---|---|---|
| committer | archshift <admin@archshift.com> | 2014-12-09 22:07:28 -0800 |
| commit | 4763fca9f82274de22422c6e6b27aa69401454c2 (patch) | |
| tree | 262f7cd3531df15199e5ac857c49f7c943bcaf09 /src/common/string_util.cpp | |
| parent | a1f9cde8060b4e047d992896073d10cbdfc7259b (diff) | |
Explicitly specify LE strings to iconv, fixes paths in Steel Diver
Diffstat (limited to 'src/common/string_util.cpp')
| -rw-r--r-- | src/common/string_util.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/common/string_util.cpp b/src/common/string_util.cpp index 7fb7ede5e3..19e162c270 100644 --- a/src/common/string_util.cpp +++ b/src/common/string_util.cpp @@ -528,7 +528,7 @@ std::u16string UTF8ToUTF16(const std::string& input) { 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) { 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) { - return CodeToUTF8("UTF-16", input); + return CodeToUTF8("UTF-16LE", input); } std::string CP1252ToUTF8(const std::string& input) |