mewin/nana
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

hotfix for 0.9

Browse Source 
Fixed a charset issue, wchar_t is string character as encoded in UCS2 in
MinGW.
This commit is contained in:
cnjinhao 2014-12-13 01:01:13 +08:00
parent 7bdf8a9f6b
commit 7a42e8e2ed
1 changed files with 41 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
source/charset.cpp
View File

@ -799,16 +799,31 @@ namespace nana
switch(utf_x_) switch(utf_x_)
{ {
case unicode::utf8: case unicode::utf8:
#if defined(NANA_MINGW)
strbuf = detail::utf8_to_utf16(data_, true);
detail::put_utf16char(strbuf, 0, true);
#else
strbuf = detail::utf8_to_utf32(data_, true); strbuf = detail::utf8_to_utf32(data_, true);
detail::put_utf32char(strbuf, 0, true); detail::put_utf32char(strbuf, 0, true);
#endif
break; break;
case unicode::utf16: case unicode::utf16:
#if defined(NANA_MINGW)
strbuf = data_;
detail::put_utf16char(strbuf, 0, true);
#else
strbuf = detail::utf16_to_utf32(data_); strbuf = detail::utf16_to_utf32(data_);
detail::put_utf32char(strbuf, 0, true); detail::put_utf32char(strbuf, 0, true);
#endif
break; break;
case unicode::utf32: case unicode::utf32:
#if defined(NANA_MINGW)
strbuf = detail::utf32_to_utf16(data_);
detail::put_utf16char(strbuf, 0, true);
#else
strbuf = data_; strbuf = data_;
detail::put_utf32char(strbuf, 0, true); detail::put_utf32char(strbuf, 0, true);
#endif
break; break;
} }
@ -892,13 +907,25 @@ namespace nana
switch(utf_x_) switch(utf_x_)
{ {
case unicode::utf8: case unicode::utf8:
#if defined(NANA_MINGW)
bytes = detail::utf8_to_utf16(data_, true);
#else
bytes = detail::utf8_to_utf32(data_, true); bytes = detail::utf8_to_utf32(data_, true);
#endif
break; break;
case unicode::utf16: case unicode::utf16:
#if defined(NANA_MINGW)
bytes = data_;
#else
bytes = detail::utf16_to_utf32(data_); bytes = detail::utf16_to_utf32(data_);
#endif
break; break;
case unicode::utf32: case unicode::utf32:
#if defined(NANA_MINGW)
bytes = detail::utf32_to_utf16(data_);
#else
bytes = data_; bytes = data_;
#endif
break; break;
} }
return std::wstring(reinterpret_cast<const wchar_t*>(bytes.c_str()), bytes.size() / sizeof(wchar_t)); return std::wstring(reinterpret_cast<const wchar_t*>(bytes.c_str()), bytes.size() / sizeof(wchar_t));
@ -957,11 +984,23 @@ namespace nana
switch(encoding) switch(encoding)
{ {
case unicode::utf8: case unicode::utf8:
#if defined(NANA_MINGW)
return detail::utf16_to_utf8(std::string(reinterpret_cast<const char*>(data_.c_str()), data_.size() * sizeof(wchar_t)));
#else
return detail::utf32_to_utf8(std::string(reinterpret_cast<const char*>(data_.c_str()), data_.size() * sizeof(wchar_t))); return detail::utf32_to_utf8(std::string(reinterpret_cast<const char*>(data_.c_str()), data_.size() * sizeof(wchar_t)));
#endif
case unicode::utf16: case unicode::utf16:
return detail::utf32_to_utf16(std::string(reinterpret_cast<const char*>(data_.c_str()), data_.size() * sizeof(wchar_t))); #if defined(NANA_MINGW)
case unicode::utf32:
return std::string(reinterpret_cast<const char*>(data_.c_str()), data_.size() * sizeof(wchar_t)); return std::string(reinterpret_cast<const char*>(data_.c_str()), data_.size() * sizeof(wchar_t));
#else
return detail::utf32_to_utf16(std::string(reinterpret_cast<const char*>(data_.c_str()), data_.size() * sizeof(wchar_t)));
#endif
case unicode::utf32:
#if defined(NANA_MINGW)
return detail::utf16_to_utf32(std::string(reinterpret_cast<const char*>(data_.c_str()), data_.size() * sizeof(wchar_t)));
#else
return std::string(reinterpret_cast<const char*>(data_.c_str()), data_.size() * sizeof(wchar_t));
#endif
} }
return {}; return {};
} }