ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Modified StringUtil to change UTF16ToUTF8 to use a wstring_convert and codecvt_utf8<wchar_t> to convert a UTF16 wstring to a UTF8 string.

This commit is contained in:
34will 2018-01-11 19:54:16 +00:00
parent a949e98d9b
commit 86a787bdf9
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Source/Core/Common/StringUtil.cpp
View File

@ -29,6 +29,7 @@
constexpr u32 CODEPAGE_SHIFT_JIS = 932; constexpr u32 CODEPAGE_SHIFT_JIS = 932;
constexpr u32 CODEPAGE_WINDOWS_1252 = 1252; constexpr u32 CODEPAGE_WINDOWS_1252 = 1252;
#else #else
#include <codecvt>
#include <errno.h> #include <errno.h>
#include <iconv.h> #include <iconv.h>
#include <locale.h> #include <locale.h>
@ -564,7 +565,8 @@ std::string UTF8ToSHIFTJIS(const std::string& input)
std::string UTF16ToUTF8(const std::wstring& input) std::string UTF16ToUTF8(const std::wstring& input)
{ {
return CodeToUTF8("UTF-16LE", input); std::wstring_convert<std::codecvt_utf8<wchar_t>, wchar_t> converter;
return converter.to_bytes(input);
} }
std::string UTF16BEToUTF8(const char16_t* str, size_t max_size) std::string UTF16BEToUTF8(const char16_t* str, size_t max_size)