TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-01 09:23:03 -04:00
Code Issues Packages Projects Releases Wiki Activity

dtoolutil: minor fix to TextEncoder::append_text

Browse Source
This commit is contained in:
rdb 2018-10-15 13:27:36 +02:00
parent 2d80d6d063
commit d7f19b73e0
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
dtool/src/dtoolutil/textEncoder_ext.cxx
View File

@ -94,7 +94,12 @@ append_text(PyObject *text) {
#if PY_VERSION_HEX >= 0x03030000 #if PY_VERSION_HEX >= 0x03030000
Py_ssize_t len; Py_ssize_t len;
const char *str = PyUnicode_AsUTF8AndSize(text, &len); const char *str = PyUnicode_AsUTF8AndSize(text, &len);
_this->append_text(std::string(str, len)); std::string text_str(str, len);
if (_this->get_encoding() == TextEncoder::E_utf8) {
_this->append_text(text_str);
} else {
_this->append_wtext(TextEncoder::decode_text(text_str, TextEncoder::E_utf8));
}
#else #else
Py_ssize_t len = PyUnicode_GET_SIZE(text); Py_ssize_t len = PyUnicode_GET_SIZE(text);
wchar_t *str = (wchar_t *)alloca(sizeof(wchar_t) * (len + 1)); wchar_t *str = (wchar_t *)alloca(sizeof(wchar_t) * (len + 1));