dany/libwebp
1
0
Fork 0
mirror of https://github.com/webmproject/libwebp.git synced 2025-07-12 22:14:29 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

introduce a common signature for all image reader function

Browse Source 
-> WebPImageReader

Introduce a variant of image-guessing function that returns a reader
directly: WebPGuessImageReader()

Change-Id: I5ddc53024fcf941e33d997b2be6aa1a963d939ab
This commit is contained in:
Pascal Massimino
2016-06-01 20:55:29 +02:00
parent ae2a7222ce
commit d77b877cc9
5 changed files with 32 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
examples/cwebp.c
View File

@ -105,19 +105,8 @@ static int ReadPicture(const char* const filename, WebPPicture* const pic,
if (!ok) goto End;
if (pic->width == 0 || pic->height == 0) {
ok = 0;
if (data_size >= 12) {
const WebPInputFileFormat format = WebPGuessImageType(data, data_size);
if (format == WEBP_PNG_FORMAT) {
ok = ReadPNG(data, data_size, pic, keep_alpha, metadata);
} else if (format == WEBP_JPEG_FORMAT) {
ok = ReadJPEG(data, data_size, pic, metadata);
} else if (format == WEBP_TIFF_FORMAT) {
ok = ReadTIFF(data, data_size, pic, keep_alpha, metadata);
} else if (format == WEBP_WEBP_FORMAT) {
ok = ReadWebP(data, data_size, pic, keep_alpha, metadata);
}
}
WebPImageReader reader = WebPGuessImageReader(data, data_size);
ok = (reader != NULL) && reader(data, data_size, pic, keep_alpha, metadata);
} else {
// If image size is specified, infer it as YUV format.
ok = ReadYUV(data, data_size, pic);