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

Merge "wicdec: add ICC profile extraction"

Browse Source
This commit is contained in:
James Zern
2013-02-04 15:43:39 -08:00
committed by Gerrit Code Review
parent 146c6e3be8 e83ff7decd
commit 7381254e9a
3 changed files with 86 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
examples/cwebp.c
View File

@ -79,7 +79,6 @@ static int ReadYUV(FILE* in_file, WebPPicture* const pic) {
static int ReadPicture(const char* const filename, WebPPicture* const pic,
int keep_alpha, Metadata* const metadata) {
int ok;
(void)metadata; // TODO(jzern): add metadata extraction using WIC
if (pic->width != 0 && pic->height != 0) {
// If image size is specified, infer it as YUV format.
FILE* in_file = fopen(filename, "rb");
@ -91,7 +90,7 @@ static int ReadPicture(const char* const filename, WebPPicture* const pic,
fclose(in_file);
} else {
// If no size specified, try to decode it using WIC.
ok = ReadPictureWithWIC(filename, pic, keep_alpha);
ok = ReadPictureWithWIC(filename, pic, keep_alpha, metadata);
}
if (!ok) {
fprintf(stderr, "Error! Could not process file %s\n", filename);
@ -827,10 +826,10 @@ int main(int argc, const char *argv[]) {
start = token + 1;
}
#ifdef HAVE_WINCODEC_H
if (keep_metadata != 0) {
if (keep_metadata != 0 && keep_metadata != METADATA_ICCP) {
// TODO(jzern): remove when -metadata is supported on all platforms.
fprintf(stderr, "Warning: -metadata is currently unsupported on this"
" platform. Ignoring this option!\n");
fprintf(stderr, "Warning: only ICC profile extraction is currently"
" supported on this platform!\n");
}
#endif
} else if (!strcmp(argv[c], "-v")) {