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

issue 396 ios modified.

This commit is contained in:
yangws 2011-03-28 13:41:14 +08:00
parent 814b66b089
commit a5040e0ccb
2 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
HelloWorld/ios/HelloWorld.xcodeproj/project.pbxproj.REMOVED.git-id
View File

@ -1 +1 @@
d5a987afa7d4b73559fafa94ca068affc445ddab
f22d2c6313c35aa8df07f3d3baa449f473e6c02a

24
cocos2dx/platform/ios/CCImage_ios.mm
View File

@ -459,12 +459,18 @@ CCImage::CCImage()
: m_nWidth(0)
, m_nHeight(0)
, m_nBitsPerComponent(0)
, m_pData(0)
, m_bHasAlpha(false)
, m_bPreMulti(false)
{
}
CCImage::~CCImage()
{
CC_SAFE_DELETE_ARRAY(m_pData);
}
bool CCImage::initWithImageFile(const char * strPath, EImageFormat eImgFmt/* = eFmtPng*/)
{
bool bRet = false;
@ -483,12 +489,12 @@ bool CCImage::initWithImageFile(const char * strPath, EImageFormat eImgFmt/* = e
}
if (bRet)
{
m_nHeight = (ccxInt16)info.height;
m_nWidth = (ccxInt16)info.width;
m_nHeight = (short)info.height;
m_nWidth = (short)info.width;
m_nBitsPerComponent = info.bitsPerComponent;
m_bHasAlpha = info.hasAlpha;
m_bPreMulti = info.isPremultipliedAlpha;
m_pData.reset(info.data);
m_pData = info.data;
}
return bRet;
}
@ -504,12 +510,12 @@ bool CCImage::initWithImageData(void * pData, int nDataLen, EImageFormat eFmt/*
} while (0);
if (bRet)
{
m_nHeight = (ccxInt16)info.height;
m_nWidth = (ccxInt16)info.width;
m_nHeight = (short)info.height;
m_nWidth = (short)info.width;
m_nBitsPerComponent = info.bitsPerComponent;
m_bHasAlpha = info.hasAlpha;
m_bPreMulti = info.isPremultipliedAlpha;
m_pData.reset(info.data);
m_pData = info.data;
}
return bRet;
}
@ -530,12 +536,12 @@ bool CCImage::initWithString(
{
return false;
}
m_nHeight = (ccxInt16)info.height;
m_nWidth = (ccxInt16)info.width;
m_nHeight = (short)info.height;
m_nWidth = (short)info.width;
m_nBitsPerComponent = info.bitsPerComponent;
m_bHasAlpha = info.hasAlpha;
m_bPreMulti = info.isPremultipliedAlpha;
m_pData.reset(info.data);
m_pData = info.data;
return true;
}