From ba111959fa9ac4a40dfb1e7bafe2d2d4a7ef371b Mon Sep 17 00:00:00 2001 From: 34will Date: Wed, 10 Jan 2018 14:49:35 +0000 Subject: [PATCH] Modified StringUtil to use a u16string instead of a wstring in the non-win32 UTF16BEToUTR8 method. --- Source/Core/Common/StringUtil.cpp | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/Source/Core/Common/StringUtil.cpp b/Source/Core/Common/StringUtil.cpp index de06d3c3aa..83384479ee 100644 --- a/Source/Core/Common/StringUtil.cpp +++ b/Source/Core/Common/StringUtil.cpp @@ -472,6 +472,14 @@ std::string CP1252ToUTF8(const std::string& input) return UTF16ToUTF8(CPToUTF16(CODEPAGE_WINDOWS_1252, input)); } +std::string UTF16BEToUTF8(const char16_t* str, size_t max_size) +{ + const char16_t* str_end = std::find(str, str + max_size, '\0'); + std::wstring result(static_cast(str_end - str), '\0'); + std::transform(str, str_end, result.begin(), static_cast(Common::swap16)); + return UTF16ToUTF8(result); +} + #else template @@ -559,12 +567,12 @@ std::string UTF16ToUTF8(const std::wstring& input) return CodeToUTF8("UTF-16LE", input); } -#endif - std::string UTF16BEToUTF8(const char16_t* str, size_t max_size) { const char16_t* str_end = std::find(str, str + max_size, '\0'); - std::wstring result(static_cast(str_end - str), '\0'); + std::u16string result(static_cast(str_end - str), '\0'); std::transform(str, str_end, result.begin(), static_cast(Common::swap16)); - return UTF16ToUTF8(result); + return CodeToUTF8("UTF-16LE", result); } + +#endif