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

Log message can't detect image format 

Wrong log message DDS and KTX check image format(other format no log
message).
isS3TC and isATITC protected, no use dev code.

Log message if format unknown
This commit is contained in:
Vladimir Perminov 2015-04-04 13:19:47 +03:00
parent 0f09fd8956
commit 3931273a58
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cocos/platform/CCImage.cpp
View File

@ -635,7 +635,6 @@ bool Image::isS3TC(const unsigned char * data, ssize_t dataLen)
if (strncmp(header->fileCode, "DDS", 3) != 0)
{
CCLOG("cocos2d: the file is not a dds file!");
return false;
}
return true;
@ -647,7 +646,6 @@ bool Image::isATITC(const unsigned char *data, ssize_t dataLen)
if (strncmp(&header->identifier[1], "KTX", 3) != 0)
{
CCLOG("cocos3d: the file is not a ktx file!");
return false;
}
return true;
@ -742,6 +740,7 @@ Image::Format Image::detectFormat(const unsigned char * data, ssize_t dataLen)
}
else
{
CCLOG("cocos2d: can't detect image format");
return Format::UNKNOWN;
}
}