Merge "cwebp/jpegdec: add JPEG metadata extraction"

This commit is contained in:
pascal massimino
2012-12-20 22:25:46 -08:00
committed by Gerrit Code Review
3 changed files with 191 additions and 4 deletions

View File

@ -332,7 +332,7 @@ static int ReadPicture(const char* const filename, WebPPicture* const pic,
if (format == PNG_) {
ok = ReadPNG(in_file, pic, keep_alpha, metadata);
} else if (format == JPEG_) {
ok = ReadJPEG(in_file, pic);
ok = ReadJPEG(in_file, pic, metadata);
} else if (format == TIFF_) {
ok = ReadTIFF(filename, pic, keep_alpha);
}