Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2165 from dumganhar/master 

fixed #1830: Casting `unsigned short*` to `jschar*` where invoking `cc_utf8_to_utf16`.
This commit is contained in:
James Chen 2013-03-14 05:41:49 -07:00
parent 3bef9cc749 911f607484
commit 8422a6ea17
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
scripting/javascript/bindings/cocos2d_specifics.cpp
View File

@ -2567,7 +2567,7 @@ JSBool js_cocos2dx_CCFileUtils_getStringFromFile(JSContext *cx, uint32_t argc, j
unsigned char* ret = cobj->getFileData(arg0, "rb", &size);
if (ret && size > 0) {
//JSString* str = JS_NewStringCopyN(cx, (const char*)ret, (size_t)size);
jschar* strUTF16 = cc_utf8_to_utf16((char*)ret);
jschar* strUTF16 = (jschar*)cc_utf8_to_utf16((char*)ret);
JSString* str = JS_NewUCStringCopyZ(cx, strUTF16);
if (str != NULL) {
JS_SET_RVAL(cx, vp, STRING_TO_JSVAL(str));