From 016d34d889b67fbd07bd5ffa28137b5f79ff480c Mon Sep 17 00:00:00 2001 From: James Chen Date: Wed, 19 Jun 2013 15:08:09 +0800 Subject: [PATCH] Compilation errors fix after merging https://github.com/cocos2d/cocos2d-x/pull/2919 --- cocos2dx/platform/ios/CCImage.mm | 4 ++-- cocos2dx/platform/marmalade/CCImage.cpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/cocos2dx/platform/ios/CCImage.mm b/cocos2dx/platform/ios/CCImage.mm index 5366516f92..8166c09f86 100644 --- a/cocos2dx/platform/ios/CCImage.mm +++ b/cocos2dx/platform/ios/CCImage.mm @@ -482,7 +482,7 @@ bool CCImage::initWithImageData(void * pData, CC_BREAK_IF(! pData || nDataLen <= 0); if (eFmt == kFmtRawData) { - bRet = _initWithRawData(pData, nDataLen, nWidth, nHeight, nBitsPerComponent, false); + bRet = initWithRawData(pData, nDataLen, nWidth, nHeight, nBitsPerComponent, false); } else if (eFmt == kFmtWebp) { @@ -506,7 +506,7 @@ bool CCImage::initWithImageData(void * pData, 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; do diff --git a/cocos2dx/platform/marmalade/CCImage.cpp b/cocos2dx/platform/marmalade/CCImage.cpp index 90f1056f88..8994460918 100644 --- a/cocos2dx/platform/marmalade/CCImage.cpp +++ b/cocos2dx/platform/marmalade/CCImage.cpp @@ -579,7 +579,7 @@ bool CCImage::initWithImageData(void * pData, } else if (kFmtRawData == eFmt) { - bRet = _initWithRawData(pData, nDataLen, nWidth, nHeight, nBitsPerComponent, false); + bRet = initWithRawData(pData, nDataLen, nWidth, nHeight, nBitsPerComponent, false); break; } else @@ -1074,7 +1074,7 @@ bool CCImage::_initWithTiffData(void* pData, int nDataLen) 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; do