Merge pull request #25706 from akien-mga/fix-etc2-decompress

Image: Fix decompressing ETC2
This commit is contained in:
Rémi Verschelde 2019-02-08 19:51:20 +01:00 committed by GitHub
commit d16b6a2dac
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -1789,7 +1789,7 @@ Error Image::decompress() {
_image_decompress_pvrtc(this); _image_decompress_pvrtc(this);
else if (format == FORMAT_ETC && _image_decompress_etc1) else if (format == FORMAT_ETC && _image_decompress_etc1)
_image_decompress_etc1(this); _image_decompress_etc1(this);
else if (format >= FORMAT_ETC2_R11 && format <= FORMAT_ETC2_RGB8A1 && _image_decompress_etc1) else if (format >= FORMAT_ETC2_R11 && format <= FORMAT_ETC2_RGB8A1 && _image_decompress_etc2)
_image_decompress_etc2(this); _image_decompress_etc2(this);
else else
return ERR_UNAVAILABLE; return ERR_UNAVAILABLE;