diff --git a/cocos2dx/platform/uphone/CCXUIImage_uphone.cpp b/cocos2dx/platform/uphone/CCXUIImage_uphone.cpp index 182e500830..1485ee115d 100644 --- a/cocos2dx/platform/uphone/CCXUIImage_uphone.cpp +++ b/cocos2dx/platform/uphone/CCXUIImage_uphone.cpp @@ -52,6 +52,7 @@ typedef struct int offset; }tImageSource; +typedef map ResourceImageMap; static ResourceImageMap s_ImgMap; static ResourceHandle s_HRes; @@ -193,7 +194,7 @@ void UIImage::setImageMap(const std::string keys[], const int values[], int nCou for (int i = 0; i < nCount; ++i) { std::string key = CCFileUtils::fullPathFromRelativePath((keys[i]).c_str()); - Int32 nResID = values[i]; + int nResID = values[i]; s_ImgMap.insert(ResourceImageMap::value_type(key, nResID)); } @@ -466,8 +467,6 @@ bool UIImage::initWithBitmap(const TBitmap* pBmp) { CCX_BREAK_IF(! pBmp); -// TBitmap* pBitmap = pBmp->DupBitmapTo32(); - // init imageinfo INT32 nWidth = pBmp->GetWidth(); INT32 nHeight = pBmp->GetHeight(); @@ -522,7 +521,7 @@ void ResourceHandle::setResourceEntry(const AppResourceEntry* pResEntry) m_pResLib = new TResourceLib(pResEntry); } -const TBitmap* ResourceHandle::LoadConstBitmap(Int32 nResID) +const TBitmap* ResourceHandle::LoadConstBitmap(int nResID) { const TBitmap* pResult = NULL; diff --git a/cocos2dx/platform/uphone/CCXUIImage_uphone.h b/cocos2dx/platform/uphone/CCXUIImage_uphone.h index 61dfc7bdd7..c178286f4e 100644 --- a/cocos2dx/platform/uphone/CCXUIImage_uphone.h +++ b/cocos2dx/platform/uphone/CCXUIImage_uphone.h @@ -25,7 +25,6 @@ THE SOFTWARE. #ifndef __PLATFORM_UPHONE_UIIMAGE_H__ #define __PLATFORM_UPHONE_UIIMAGE_H__ -#include #include #include "ccxCommon.h" #include "CCRenderTexture.h" @@ -48,8 +47,6 @@ typedef struct unsigned char *data; } tImageInfo; -typedef std::map ResourceImageMap; - class ResourceHandle { public: