ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Don't use static in unicode conversion due to multiple threads usage now

Browse Source
This commit is contained in:
Benau 2018-09-16 00:29:59 +08:00
parent 0c7475c6cf
commit b400d56585
1 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/utils/string_utils.cpp
View File

@ -790,12 +790,9 @@ namespace StringUtils
std::string wideToUtf8(const wchar_t* input) std::string wideToUtf8(const wchar_t* input)
{ {
static std::vector<char> utf8line; std::vector<char> utf8line;
utf8line.clear();
utf8::utf16to8(input, input + wcslen(input), back_inserter(utf8line)); utf8::utf16to8(input, input + wcslen(input), back_inserter(utf8line));
utf8line.push_back(0); utf8line.push_back(0);
return std::string(&utf8line[0]); return std::string(&utf8line[0]);
} // wideToUtf8 } // wideToUtf8
@ -811,12 +808,9 @@ namespace StringUtils
/** Converts the irrlicht wide string to an utf8-encoded std::string. */ /** Converts the irrlicht wide string to an utf8-encoded std::string. */
irr::core::stringw utf8ToWide(const char* input) irr::core::stringw utf8ToWide(const char* input)
{ {
static std::vector<wchar_t> utf16line; std::vector<wchar_t> utf16line;
utf16line.clear();
utf8::utf8to16(input, input + strlen(input), back_inserter(utf16line)); utf8::utf8to16(input, input + strlen(input), back_inserter(utf16line));
utf16line.push_back(0); utf16line.push_back(0);
return irr::core::stringw(&utf16line[0]); return irr::core::stringw(&utf16line[0]);
} // utf8ToWide } // utf8ToWide