From d8dc72a0396c8de517eb31063e4080d46e3d30db Mon Sep 17 00:00:00 2001
From: James Zern <jzern@google.com>
Date: Wed, 13 Mar 2013 14:04:20 -0700
Subject: [PATCH] examples: normalize icc related program arguments

use 'icc' rather than 'iccp'.

Change-Id: I9667f286bfa1cfeb0ac49148ba341d268b051b98
---
 README             |  2 +-
 examples/cwebp.c   | 12 ++++++------
 examples/webpmux.c |  2 +-
 man/cwebp.1        |  4 ++--
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/README b/README
index cd135850..9c7863fa 100644
--- a/README
+++ b/README
@@ -176,7 +176,7 @@ options:
 
   -metadata <string> ..... comma separated list of metadata to
                            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
   -quiet ................. don't print anything.
diff --git a/examples/cwebp.c b/examples/cwebp.c
index 9c5459b1..4d2c84a3 100644
--- a/examples/cwebp.c
+++ b/examples/cwebp.c
@@ -366,9 +366,9 @@ static int DumpPicture(const WebPPicture* const picture, const char* PGM_name) {
 
 enum {
   METADATA_EXIF = (1 << 0),
-  METADATA_ICCP = (1 << 1),
+  METADATA_ICC  = (1 << 1),
   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;
@@ -439,7 +439,7 @@ static int WriteWebPWithMetadata(FILE* const out,
                                             !!(keep_metadata & METADATA_EXIF),
                                             kEXIFFlag, &flags, &metadata_size);
   const int write_iccp = UpdateFlagsAndSize(&metadata->iccp,
-                                            !!(keep_metadata & METADATA_ICCP),
+                                            !!(keep_metadata & METADATA_ICC),
                                             kICCPFlag, &flags, &metadata_size);
   const int write_xmp  = UpdateFlagsAndSize(&metadata->xmp,
                                             !!(keep_metadata & METADATA_XMP),
@@ -575,7 +575,7 @@ static void HelpLong(void) {
   printf("                           ");
   printf("copy from the input to the output if present.\n");
   printf("                           "
-         "Valid values: all, none (default), exif, iccp, xmp\n");
+         "Valid values: all, none (default), exif, icc, xmp\n");
 
   printf("\n");
   printf("  -short ................. condense printed message\n");
@@ -812,7 +812,7 @@ int main(int argc, const char *argv[]) {
         { "all",  METADATA_ALL },
         { "none", 0 },
         { "exif", METADATA_EXIF },
-        { "iccp", METADATA_ICCP },
+        { "icc",  METADATA_ICC },
         { "xmp",  METADATA_XMP },
       };
       const size_t kNumTokens = sizeof(kTokens) / sizeof(kTokens[0]);
@@ -844,7 +844,7 @@ int main(int argc, const char *argv[]) {
         start = token + 1;
       }
 #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.
         fprintf(stderr, "Warning: only ICC profile extraction is currently"
                         " supported on this platform!\n");
diff --git a/examples/webpmux.c b/examples/webpmux.c
index a0f08ec1..ce5bf90b 100644
--- a/examples/webpmux.c
+++ b/examples/webpmux.c
@@ -196,7 +196,7 @@ static WebPMuxError DisplayInfo(const WebPMux* mux) {
   printf("Features present:");
   if (flag & ANIMATION_FLAG) printf(" animation");
   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 & XMP_FLAG)       printf(" XMP metadata");
   if (flag & ALPHA_FLAG)     printf(" transparency");
diff --git a/man/cwebp.1 b/man/cwebp.1
index 1f9c60cc..2e5dbb08 100644
--- a/man/cwebp.1
+++ b/man/cwebp.1
@@ -1,5 +1,5 @@
 .\"                                      Hey, EMACS: -*- nroff -*-
-.TH CWEBP 1 "March 8, 2013"
+.TH CWEBP 1 "March 13, 2013"
 .SH NAME
 cwebp \- compress an image file to a WebP file
 .SH SYNOPSIS
@@ -200,7 +200,7 @@ Specify the hint about input image type. Possible values are:
 .BI \-metadata " string
 A comma separated list of metadata to copy from the input to the output if
 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.
 
 Note: each input format may not support all combinations.