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

fixed #1138: Fixed a memory leak in CCTextureCache::addPVRImage.

This commit is contained in:
James Chen 2012-04-10 18:17:08 +08:00
parent 2885664c85
commit 6823704a46
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cocos2dx/textures/CCTextureCache.cpp
View File

@ -457,7 +457,7 @@ CCTexture2D * CCTextureCache::addPVRImage(const char* path)
{ {
CCAssert(path != NULL, "TextureCache: fileimage MUST not be nill"); CCAssert(path != NULL, "TextureCache: fileimage MUST not be nill");
CCTexture2D * tex; CCTexture2D* tex = NULL;
std::string key(path); std::string key(path);
// remove possible -HD suffix to prevent caching the same image twice (issue #1040) // remove possible -HD suffix to prevent caching the same image twice (issue #1040)
CCFileUtils::removeSuffixFromFile(key); CCFileUtils::removeSuffixFromFile(key);
@ -470,7 +470,7 @@ CCTexture2D * CCTextureCache::addPVRImage(const char* path)
// Split up directory and filename // Split up directory and filename
std::string fullpath = CCFileUtils::fullPathFromRelativePath(key.c_str()); std::string fullpath = CCFileUtils::fullPathFromRelativePath(key.c_str());
tex = new CCTexture2D(); tex = new CCTexture2D();
if( tex->initWithPVRFile(fullpath.c_str()) ) if(tex != NULL && tex->initWithPVRFile(fullpath.c_str()) )
{ {
#if CC_ENABLE_CACHE_TEXTTURE_DATA #if CC_ENABLE_CACHE_TEXTTURE_DATA
// cache the texture file name // cache the texture file name
@ -482,6 +482,7 @@ CCTexture2D * CCTextureCache::addPVRImage(const char* path)
else else
{ {
CCLOG("cocos2d: Couldn't add PVRImage:%s in CCTextureCache",key.c_str()); CCLOG("cocos2d: Couldn't add PVRImage:%s in CCTextureCache",key.c_str());
CC_SAFE_DELETE(tex);
} }
return tex; return tex;