From e3e122b3fc170b43d5431d80bdcbd8383dcfe60d Mon Sep 17 00:00:00 2001 From: badlogic Date: Mon, 1 Aug 2016 11:43:22 +0200 Subject: [PATCH] [cocos2d-x] Reverted takeBuffer PR so we are compatible with both 3.12 and < 3.12 cocos2d-x. --- spine-cocos2dx/src/spine/spine-cocos2dx.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/spine-cocos2dx/src/spine/spine-cocos2dx.cpp b/spine-cocos2dx/src/spine/spine-cocos2dx.cpp index 914a5249c..8d5e1551b 100644 --- a/spine-cocos2dx/src/spine/spine-cocos2dx.cpp +++ b/spine-cocos2dx/src/spine/spine-cocos2dx.cpp @@ -80,5 +80,8 @@ char* _spUtil_readFile (const char* path, int* length) { Data data = FileUtils::getInstance()->getDataFromFile( FileUtils::getInstance()->fullPathForFilename(path)); if (data.isNull()) return 0; - return (char*)(data.takeBuffer((ssize_t*)length)); + *length = static_cast(data.getSize()); + char* bytes = MALLOC(char, *length); + memcpy(bytes, data.getBytes(), *length); + return bytes; }