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

Merge pull request #14127 from super626/v3 

Image Bug: pvr v3 and s3tc dxt5
This commit is contained in:
pandamicro 2015-10-13 16:47:30 +08:00
parent b19bf82170 4c7edd457e
commit a741bc525e
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cocos/platform/CCImage.cpp
View File

@ -1583,6 +1583,8 @@ bool Image::initWithPVRv3Data(const unsigned char * data, ssize_t dataLen)
{
_hasPremultipliedAlpha = true;
}
else
_hasPremultipliedAlpha = false;
// sizing
int width = CC_SWAP_INT32_LITTLE_TO_HOST(header->width);
@ -1845,7 +1847,7 @@ namespace
bool Image::initWithS3TCData(const unsigned char * data, ssize_t dataLen)
{
_hasPremultipliedAlpha = false;
const uint32_t FOURCC_DXT1 = makeFourCC('D', 'X', 'T', '1');
const uint32_t FOURCC_DXT3 = makeFourCC('D', 'X', 'T', '3');
const uint32_t FOURCC_DXT5 = makeFourCC('D', 'X', 'T', '5');