Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
16,272 Commits 2 Branches 31 Tags 1.1 GiB
Commit Graph

24 Commits

Author SHA1 Message Date
hbb 5ef9eef0ae use data.isNull() instead of !data.getBytes() 2014-01-16 10:09:04 +08:00
hbb 8fac676a82 add check data valid in getStringFromFile 
so far no check would be crashed when getData faild.
maybe return an empty string is better.
 2014-01-15 12:39:56 +08:00
walzer 64af0de648 update copyrights for 2014, in cocos/2d/ folder 2014-01-07 11:25:07 +08:00
boyu0 62fc889a54 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into const_char_star_to_std_string 
Conflicts:
	cocos/2d/platform/CCFileUtils.cpp
	cocos/2d/platform/CCFileUtils.h
	cocos/2d/platform/CCImageCommon_cpp.h
	cocos/2d/platform/CCSAXParser.cpp
	cocos/2d/platform/CCSAXParser.h
 2013-12-25 10:41:37 +08:00
boyu0 3344c5243c change some const char* to const std::string& 2013-12-24 10:51:47 +08:00
James Chen 21a9f05110 Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into data-refactor 
Conflicts:
	cocos/2d/CCUserDefault.cpp
	cocos/2d/CCUserDefault.mm
	cocos/2d/CCUserDefaultAndroid.cpp
	cocos/2d/ZipUtils.cpp
	cocos/2d/platform/CCFileUtils.h
	cocos/2d/platform/CCSAXParser.cpp
 2013-12-20 21:12:11 +08:00
James Chen 58772d7dec const love in CCFileUtils.cpp. 2013-12-20 10:11:41 +08:00
Ricardo Quesada 59fee6b8d2 replaces std::for_each with for() 
replaces `std::for_each` with C++11 `for( : )`
 2013-12-19 13:34:41 -08:00
boyu0 d0b039ceda fix compile errors. 2013-12-18 22:44:03 +08:00
boyu0 e07c4ffec1 Change NULL to nullptr, edit hungarian notation. 2013-12-18 17:47:20 +08:00
James Chen 2892e8be3f Refactors Data class, adds FileUtils::getStringFromFile, FileUtils::getDataFromFile and deprecates FileUtils::getFileData. 2013-12-18 14:58:17 +08:00
boyu0 083a0eea2a Remove all std::move in function returns. 2013-12-10 16:06:05 +08:00
minggo b67d567a79 replace long with int or ssize_t 2013-12-05 17:22:22 +08:00
James 373c3b01bf issue #2790: Fixing compilation errors on linux. 2013-12-05 11:44:37 +08:00
James Chen c9767b8ea0 issue #2790: fileToValueDict —> getValueMapFromFile, fileToValueArray —> getValueVectorFromFile. 2013-12-04 17:50:57 +08:00
James Chen 54289276de issue #2790: ValueArray —> ValueVector, ValueDict —> ValueMap, IntValueDict —> IntValueMap. 2013-12-04 17:46:57 +08:00
James Chen ceaa1f26bb issue #2790: Windows run ok with ValueDict for FileUtils. 2013-12-04 16:02:54 +08:00
James Chen 76896d70d0 issue #2790: Android build was ok, fixes some warnings. 2013-12-04 16:02:54 +08:00
James Chen 4ec6e50cc4 issue #2790: Pure base data from Dictionary* to ValueDict, Array* to ValueArray. 2013-12-04 16:02:52 +08:00
Ricardo Quesada be64dd97cf replaces `delete[]` with `free()` in C-based API 
API that returns a newly allocated buffer as an output argument (not return value) are error-prone.

- Users forget to release the newly allocated buffer
- Or the call `delete` instead of `delete[]`

But some of those API need to call `realloc` on the buffer.
But `realloc` is only valid if the buffer was previously allocated with `malloc`.
If a buffer needs to be re-allocated using a C++ API, then `std::vector<char*>` should be used instead...

So, this patch does:

- Migrates the API from  `new []` / `delete[]` to  `malloc()` / `free()`
- Fixes all the memory issues: incorrect deallocs and memory leaks
- Updates the documentation
- And fixes misc issues with the API: removes `cc` from the ZipUtils class.
 2013-11-11 18:09:47 -08:00
Ricardo Quesada 84a6aa29cd Adds more 64-bit fixes 
Replaces more `int` with `long` where it makes sense.

Also , it repalces some `unsigned long` with `long` for "lenght"
values as described in our c++ guideline
 2013-11-05 17:36:44 -08:00
Ricardo Quesada ba7ed6e578 Fixes some compiler warnings 
The warnings are related to:

* 64-to-32-bit conversion
* shadow variables
 2013-11-04 16:31:36 -08:00
minggo 95acb1b9e3 issue #2905: helloworld build ok on android 2013-10-14 14:01:00 +08:00
minggo 4313c46e93 issue #2905:adjust folder structure 2013-10-12 11:22:05 +08:00