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

Also decode bmp to RGBA8888 directly

This commit is contained in:
halx99 2020-09-01 12:06:21 +08:00
parent f3c17427aa
commit 6c129165f5
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
cocos/platform/CCImage.cpp
View File

@ -1210,14 +1210,15 @@ bool Image::initWithPngData(unsigned char * data, ssize_t dataLen)
bool Image::initWithBmpData(unsigned char* data, ssize_t dataLen) bool Image::initWithBmpData(unsigned char* data, ssize_t dataLen)
{ {
const int nrChannels = 3; const int nrChannels = 4;
_data = stbi_load_from_memory(data, dataLen, &_width, &_height, nullptr, nrChannels); _data = stbi_load_from_memory(data, dataLen, &_width, &_height, nullptr, nrChannels);
if (_data) { if (_data) {
_dataLen = _width * _height * nrChannels; _dataLen = _width * _height * nrChannels;
_fileType = Format::BMP; _fileType = Format::BMP;
_pixelFormat = backend::PixelFormat::RGB888; _pixelFormat = backend::PixelFormat::RGBA8888;
return true;
} }
return true; return false;
} }
bool Image::initWithWebpData(unsigned char* data, ssize_t dataLen) bool Image::initWithWebpData(unsigned char* data, ssize_t dataLen)