dany/libwebp
1
0
Fork 0
mirror of https://github.com/webmproject/libwebp.git synced 2024-12-27 22:28:22 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

examples: normalize icc related program arguments

Browse Source 
use 'icc' rather than 'iccp'.

Change-Id: I9667f286bfa1cfeb0ac49148ba341d268b051b98
This commit is contained in:
James Zern 2013-03-13 14:04:20 -07:00
parent 5e338e0b9a
commit d8dc72a039
4 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README
View File

@ -176,7 +176,7 @@ options:
-metadata <string> ..... comma separated list of metadata to -metadata <string> ..... comma separated list of metadata to
copy from the input to the output if present. copy from the input to the output if present.
Valid values: all, none (default), exif, iccp, xmp Valid values: all, none (default), exif, icc, xmp
-short ................. condense printed message -short ................. condense printed message
-quiet ................. don't print anything. -quiet ................. don't print anything.

12
examples/cwebp.c
View File

@ -366,9 +366,9 @@ static int DumpPicture(const WebPPicture* const picture, const char* PGM_name) {
enum { enum {
METADATA_EXIF = (1 << 0), METADATA_EXIF = (1 << 0),
METADATA_ICCP = (1 << 1), METADATA_ICC = (1 << 1),
METADATA_XMP = (1 << 2), METADATA_XMP = (1 << 2),
METADATA_ALL = METADATA_EXIF | METADATA_ICCP | METADATA_XMP METADATA_ALL = METADATA_EXIF | METADATA_ICC | METADATA_XMP
}; };
static const int kChunkHeaderSize = 8; static const int kChunkHeaderSize = 8;
@ -439,7 +439,7 @@ static int WriteWebPWithMetadata(FILE* const out,
!!(keep_metadata & METADATA_EXIF), !!(keep_metadata & METADATA_EXIF),
kEXIFFlag, &flags, &metadata_size); kEXIFFlag, &flags, &metadata_size);
const int write_iccp = UpdateFlagsAndSize(&metadata->iccp, const int write_iccp = UpdateFlagsAndSize(&metadata->iccp,
!!(keep_metadata & METADATA_ICCP), !!(keep_metadata & METADATA_ICC),
kICCPFlag, &flags, &metadata_size); kICCPFlag, &flags, &metadata_size);
const int write_xmp = UpdateFlagsAndSize(&metadata->xmp, const int write_xmp = UpdateFlagsAndSize(&metadata->xmp,
!!(keep_metadata & METADATA_XMP), !!(keep_metadata & METADATA_XMP),
@ -575,7 +575,7 @@ static void HelpLong(void) {
printf(" "); printf(" ");
printf("copy from the input to the output if present.\n"); printf("copy from the input to the output if present.\n");
printf(" " printf(" "
"Valid values: all, none (default), exif, iccp, xmp\n"); "Valid values: all, none (default), exif, icc, xmp\n");
printf("\n"); printf("\n");
printf(" -short ................. condense printed message\n"); printf(" -short ................. condense printed message\n");
@ -812,7 +812,7 @@ int main(int argc, const char *argv[]) {
{ "all", METADATA_ALL }, { "all", METADATA_ALL },
{ "none", 0 }, { "none", 0 },
{ "exif", METADATA_EXIF }, { "exif", METADATA_EXIF },
{ "iccp", METADATA_ICCP }, { "icc", METADATA_ICC },
{ "xmp", METADATA_XMP }, { "xmp", METADATA_XMP },
}; };
const size_t kNumTokens = sizeof(kTokens) / sizeof(kTokens[0]); const size_t kNumTokens = sizeof(kTokens) / sizeof(kTokens[0]);
@ -844,7 +844,7 @@ int main(int argc, const char *argv[]) {
start = token + 1; start = token + 1;
} }
#ifdef HAVE_WINCODEC_H #ifdef HAVE_WINCODEC_H
if (keep_metadata != 0 && keep_metadata != METADATA_ICCP) { if (keep_metadata != 0 && keep_metadata != METADATA_ICC) {
// TODO(jzern): remove when -metadata is supported on all platforms. // TODO(jzern): remove when -metadata is supported on all platforms.
fprintf(stderr, "Warning: only ICC profile extraction is currently" fprintf(stderr, "Warning: only ICC profile extraction is currently"
" supported on this platform!\n"); " supported on this platform!\n");

2
examples/webpmux.c
View File

@ -196,7 +196,7 @@ static WebPMuxError DisplayInfo(const WebPMux* mux) {
printf("Features present:"); printf("Features present:");
if (flag & ANIMATION_FLAG) printf(" animation"); if (flag & ANIMATION_FLAG) printf(" animation");
if (flag & FRAGMENTS_FLAG) printf(" image fragments"); if (flag & FRAGMENTS_FLAG) printf(" image fragments");
if (flag & ICCP_FLAG) printf(" icc profile"); if (flag & ICCP_FLAG) printf(" ICC profile");
if (flag & EXIF_FLAG) printf(" EXIF metadata"); if (flag & EXIF_FLAG) printf(" EXIF metadata");
if (flag & XMP_FLAG) printf(" XMP metadata"); if (flag & XMP_FLAG) printf(" XMP metadata");
if (flag & ALPHA_FLAG) printf(" transparency"); if (flag & ALPHA_FLAG) printf(" transparency");

4
man/cwebp.1
View File

@ -1,5 +1,5 @@
.\" Hey, EMACS: -*- nroff -*- .\" Hey, EMACS: -*- nroff -*-
.TH CWEBP 1 "March 8, 2013" .TH CWEBP 1 "March 13, 2013"
.SH NAME .SH NAME
cwebp \- compress an image file to a WebP file cwebp \- compress an image file to a WebP file
.SH SYNOPSIS .SH SYNOPSIS
@ -200,7 +200,7 @@ Specify the hint about input image type. Possible values are:
.BI \-metadata " string .BI \-metadata " string
A comma separated list of metadata to copy from the input to the output if A comma separated list of metadata to copy from the input to the output if
present. present.
Valid values: \fBall\fP, \fBnone\fP, \fBexif\fP, \fBiccp\fP, \fBxmp\fP. Valid values: \fBall\fP, \fBnone\fP, \fBexif\fP, \fBicc\fP, \fBxmp\fP.
The default is \fBnone\fP. The default is \fBnone\fP.
Note: each input format may not support all combinations. Note: each input format may not support all combinations.