Merge pull request #9533 from andyque/fixWebpPremultiplyAlpha

fix webp format premultipliedAlpha error
2014-12-19 09:53:44 +08:00 · 2014-12-19 09:53:44 +08:00 · 6f0a4191cb
parent 2a72efa3e2 6856f03bff
commit 6f0a4191cb
1 changed files with 3 additions and 0 deletions
--- a/cocos/platform/CCImage.cpp
+++ b/cocos/platform/CCImage.cpp
@ -2042,6 +2042,9 @@ bool Image::initWithWebpData(const unsigned char * data, ssize_t dataLen)
        _width    = config.input.width;
        _height   = config.input.height;
        
+        //webp doesn't have premultipliedAlpha
+        _hasPremultipliedAlpha = false;
+        
        _dataLen = _width * _height * 4;
        _data = static_cast<unsigned char*>(malloc(_dataLen * sizeof(unsigned char)));