Merge pull request #5047 from btspoony/develop

closed #3750: Fix long string will be cut off by function “cc_utf8_to_utf16”.
This commit is contained in:
James Chen 2014-01-16 19:06:39 -08:00
commit 09f56f3a8b
1 changed files with 1 additions and 1 deletions

View File

@ -279,7 +279,7 @@ cc_utf8_get_char (const char * p)
unsigned short* cc_utf8_to_utf16(const char* str_old, int length/* = -1 */, int* rUtf16Size/* = nullptr */) unsigned short* cc_utf8_to_utf16(const char* str_old, int length/* = -1 */, int* rUtf16Size/* = nullptr */)
{ {
unsigned short len = cc_utf8_strlen(str_old, length); long len = cc_utf8_strlen(str_old, length);
if (rUtf16Size != nullptr) { if (rUtf16Size != nullptr) {
*rUtf16Size = len; *rUtf16Size = len;
} }