|
@@ -261,14 +261,6 @@ std::wstring UTF8ToUTF16W(const std::string& input) {
|
|
|
return CPToUTF16(CP_UTF8, input);
|
|
return CPToUTF16(CP_UTF8, input);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
-std::string SHIFTJISToUTF8(const std::string& input) {
|
|
|
|
|
- return UTF16ToUTF8(CPToUTF16(932, input));
|
|
|
|
|
-}
|
|
|
|
|
-
|
|
|
|
|
-std::string CP1252ToUTF8(const std::string& input) {
|
|
|
|
|
- return UTF16ToUTF8(CPToUTF16(1252, input));
|
|
|
|
|
-}
|
|
|
|
|
-
|
|
|
|
|
#else
|
|
#else
|
|
|
|
|
|
|
|
template <typename T>
|
|
template <typename T>
|
|
@@ -368,17 +360,6 @@ std::string UTF16ToUTF8(const std::u16string& input) {
|
|
|
return CodeToUTF8("UTF-16LE", input);
|
|
return CodeToUTF8("UTF-16LE", input);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
-std::string CP1252ToUTF8(const std::string& input) {
|
|
|
|
|
- // return CodeToUTF8("CP1252//TRANSLIT", input);
|
|
|
|
|
- // return CodeToUTF8("CP1252//IGNORE", input);
|
|
|
|
|
- return CodeToUTF8("CP1252", input);
|
|
|
|
|
-}
|
|
|
|
|
-
|
|
|
|
|
-std::string SHIFTJISToUTF8(const std::string& input) {
|
|
|
|
|
- // return CodeToUTF8("CP932", input);
|
|
|
|
|
- return CodeToUTF8("SJIS", input);
|
|
|
|
|
-}
|
|
|
|
|
-
|
|
|
|
|
#endif
|
|
#endif
|
|
|
|
|
|
|
|
std::string StringFromFixedZeroTerminatedBuffer(const char* buffer, std::size_t max_len) {
|
|
std::string StringFromFixedZeroTerminatedBuffer(const char* buffer, std::size_t max_len) {
|