dany/libwebp
1
0
Fork 0
mirror of https://github.com/webmproject/libwebp.git synced 2024-12-27 06:08:21 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge "fix bug due to overzealous check in WebPPictureYUVAToARGB()"

Browse Source
This commit is contained in:
skal 2013-12-04 00:54:35 -08:00 committed by Gerrit Code Review
commit cb63785545
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/enc/picture.c
View File

@ -888,8 +888,7 @@ int WebPPictureImportBGRX(WebPPicture* picture,
int WebPPictureYUVAToARGB(WebPPicture* picture) { int WebPPictureYUVAToARGB(WebPPicture* picture) {
if (picture == NULL) return 0; if (picture == NULL) return 0;
if (picture->memory_ == NULL || picture->y == NULL || if (picture->y == NULL || picture->u == NULL || picture->v == NULL) {
picture->u == NULL || picture->v == NULL) {
return WebPEncodingSetError(picture, VP8_ENC_ERROR_NULL_PARAMETER); return WebPEncodingSetError(picture, VP8_ENC_ERROR_NULL_PARAMETER);
} }
if ((picture->colorspace & WEBP_CSP_ALPHA_BIT) && picture->a == NULL) { if ((picture->colorspace & WEBP_CSP_ALPHA_BIT) && picture->a == NULL) {

2
src/webp/encode.h
View File

@ -20,7 +20,7 @@
extern "C" { extern "C" {
#endif #endif
#define WEBP_ENCODER_ABI_VERSION 0x0201 // MAJOR(8b) + MINOR(8b) #define WEBP_ENCODER_ABI_VERSION 0x0202 // MAJOR(8b) + MINOR(8b)
// Note: forward declaring enumerations is not allowed in (strict) C and C++, // Note: forward declaring enumerations is not allowed in (strict) C and C++,
// the types are left here for reference. // the types are left here for reference.