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

Compilation errors fix after merging https://github.com/cocos2d/cocos2d-x/pull/2919

This commit is contained in:
James Chen 2013-06-19 15:08:09 +08:00
parent 7b9ee7c8ed
commit 016d34d889
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cocos2dx/platform/ios/CCImage.mm
View File

@ -482,7 +482,7 @@ bool CCImage::initWithImageData(void * pData,
CC_BREAK_IF(! pData || nDataLen <= 0); CC_BREAK_IF(! pData || nDataLen <= 0);
if (eFmt == kFmtRawData) if (eFmt == kFmtRawData)
{ {
bRet = _initWithRawData(pData, nDataLen, nWidth, nHeight, nBitsPerComponent, false); bRet = initWithRawData(pData, nDataLen, nWidth, nHeight, nBitsPerComponent, false);
} }
else if (eFmt == kFmtWebp) else if (eFmt == kFmtWebp)
{ {
@ -506,7 +506,7 @@ bool CCImage::initWithImageData(void * pData,
return bRet; return bRet;
} }
bool CCImage::_initWithRawData(void *pData, int nDatalen, int nWidth, int nHeight, int nBitsPerComponent, bool bPreMulti) bool CCImage::initWithRawData(void *pData, int nDatalen, int nWidth, int nHeight, int nBitsPerComponent, bool bPreMulti)
{ {
bool bRet = false; bool bRet = false;
do do

4
cocos2dx/platform/marmalade/CCImage.cpp
View File

@ -579,7 +579,7 @@ bool CCImage::initWithImageData(void * pData,
} }
else if (kFmtRawData == eFmt) else if (kFmtRawData == eFmt)
{ {
bRet = _initWithRawData(pData, nDataLen, nWidth, nHeight, nBitsPerComponent, false); bRet = initWithRawData(pData, nDataLen, nWidth, nHeight, nBitsPerComponent, false);
break; break;
} }
else else
@ -1074,7 +1074,7 @@ bool CCImage::_initWithTiffData(void* pData, int nDataLen)
return bRet; return bRet;
} }
bool CCImage::_initWithRawData(void * pData, int nDatalen, int nWidth, int nHeight, int nBitsPerComponent, bool bPreMulti) bool CCImage::initWithRawData(void * pData, int nDatalen, int nWidth, int nHeight, int nBitsPerComponent, bool bPreMulti)
{ {
bool bRet = false; bool bRet = false;
do do