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

issue #2188:fix compiling error of iOS

This commit is contained in:
minggo 2013-05-21 18:18:44 +08:00
parent cc2b00e9fe
commit 0857fdd599
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -481,7 +481,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); bRet = _initWithRawData(pData, nDataLen, nWidth, nHeight, nBitsPerComponent, false);
} }
else if (eFmt == kFmtWebp) else if (eFmt == kFmtWebp)
{ {
@ -505,7 +505,7 @@ bool CCImage::initWithImageData(void * pData,
return bRet; return bRet;
} }
bool CCImage::_initWithRawData(void *pData, int nDatalen, int nWidth, int nHeight, int nBitsPerComponent) bool CCImage::_initWithRawData(void *pData, int nDatalen, int nWidth, int nHeight, int nBitsPerComponent, bool bPreMulti)
{ {
bool bRet = false; bool bRet = false;
do do