Merge "webpinfo: tolerate ALPH+VP8L"

This commit is contained in:
Hui Su 2017-05-22 17:17:09 +00:00 committed by Gerrit Code Review
commit 186bc9b735

View File

@ -828,8 +828,7 @@ static WebPInfoStatus ProcessImageChunk(const ChunkData* const chunk_data,
} }
if (chunk_data->id_ == CHUNK_VP8L && if (chunk_data->id_ == CHUNK_VP8L &&
webp_info->chunk_counts_[CHUNK_ALPHA]) { webp_info->chunk_counts_[CHUNK_ALPHA]) {
LOG_ERROR("Both VP8L and ALPH chunks are detected."); LOG_WARN("Both VP8L and ALPH chunks are detected.");
return WEBP_INFO_PARSE_ERROR;
} }
if (webp_info->chunk_counts_[CHUNK_ANIM] || if (webp_info->chunk_counts_[CHUNK_ANIM] ||
webp_info->chunk_counts_[CHUNK_ANMF]) { webp_info->chunk_counts_[CHUNK_ANMF]) {