Merge "cwebp: fallback to native webp decode in WIC builds"

This commit is contained in:
James Zern 2014-05-28 15:03:34 -07:00 committed by Gerrit Code Review
commit 4c398699ef

View File

@ -94,6 +94,9 @@ static int ReadPicture(const char* const filename, WebPPicture* const pic,
} else { } else {
// If no size specified, try to decode it using WIC. // If no size specified, try to decode it using WIC.
ok = ReadPictureWithWIC(filename, pic, keep_alpha, metadata); ok = ReadPictureWithWIC(filename, pic, keep_alpha, metadata);
if (!ok) {
ok = ReadWebP(filename, pic, keep_alpha, metadata);
}
} }
if (!ok) { if (!ok) {
fprintf(stderr, "Error! Could not process file %s\n", filename); fprintf(stderr, "Error! Could not process file %s\n", filename);