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

Merge pull request #14990 from j-jorge/wic-macro-test 

Uniformize image support macro usage.
This commit is contained in:
minggo 2016-04-20 09:57:57 +08:00
parent 29df93c5e4 a3f28a18df
commit 5d3b654a74
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cocos/platform/CCImage.cpp
View File

@ -802,7 +802,7 @@ namespace
#endif // CC_USE_JPEG
}
#ifdef CC_USE_WIC
#if CC_USE_WIC
bool Image::decodeWithWIC(const unsigned char *data, ssize_t dataLen)
{
bool bRet = false;

4
cocos/platform/CCImage.h
View File

@ -30,7 +30,7 @@ THE SOFTWARE.
#include "base/CCRef.h"
#include "renderer/CCTexture2D.h"
#if defined(CC_USE_WIC)
#if CC_USE_WIC
#include "platform/winrt/WICImageLoader-winrt.h"
#endif
@ -155,7 +155,7 @@ public:
static void setPVRImagesHavePremultipliedAlpha(bool haveAlphaPremultiplied);
protected:
#if defined(CC_USE_WIC)
#if CC_USE_WIC
bool encodeWithWIC(const std::string& filePath, bool isToRGB, GUID containerFormat);
bool decodeWithWIC(const unsigned char *data, ssize_t dataLen);
#endif

2
cocos/platform/winrt/WICImageLoader-winrt.cpp
View File

@ -29,7 +29,7 @@ obtained from https://directxtk.codeplex.com
NS_CC_BEGIN
#if defined(CC_USE_WIC)
#if CC_USE_WIC
IWICImagingFactory* WICImageLoader::_wicFactory = NULL;

2
cocos/platform/winrt/WICImageLoader-winrt.h
View File

@ -31,7 +31,7 @@ obtained from https://directxtk.codeplex.com
#include "base/ccConfig.h"
#if defined(CC_USE_WIC)
#if CC_USE_WIC
#include <memory>
#include <string>