Cleanup on tools & samples

add --help option
add copyright notice
refactoring on xgetopt
remove unused toggle char

1 files changed, 156 insertions, 160 deletions

diff --git a/utils/linkicc/linkicc.c b/utils/linkicc/linkicc.c
index 85a5b2c..507d4a9 100644
--- a/utils/linkicc/linkicc.c
+++ b/utils/linkicc/linkicc.c
@@ -49,71 +49,57 @@ static cmsFloat64Number Version    = 4.3;
 static
 int Help(int level)
 {
-     switch (level) {
-
-     default:
-     case 0:
-
-         fprintf(stderr, "\nlinkicc: Links profiles into a single devicelink.\n");     
-
-         fprintf(stderr, "\n");     
-         fprintf(stderr, "usage: linkicc [flags] <profiles>\n\n");
-         fprintf(stderr, "flags:\n\n");         
-         fprintf(stderr, "%co<profile> - Output devicelink profile. [defaults to 'devicelink.icc']\n", SW);     
-
-         PrintRenderingIntents();
-
-         fprintf(stderr, "%cc<0,1,2> - Precision (0=LowRes, 1=Normal, 2=Hi-res) [defaults to 1]\n", SW);     
-         fprintf(stderr, "%cn<gridpoints> - Alternate way to set precision, number of CLUT points\n", SW);     
-         fprintf(stderr, "%cd<description> - description text (quotes can be used)\n", SW);     
-         fprintf(stderr, "%cy<copyright> - copyright notice (quotes can be used)\n", SW);    
-         
-         fprintf(stderr, "\n%ck<0..400> - Ink-limiting in %% (CMYK only)\n", SW);
-         fprintf(stderr, "%c8 - Creates 8-bit devicelink\n", SW);
-         fprintf(stderr, "%cx - Creatively, guess deviceclass of resulting profile.\n", SW);
-         fprintf(stderr, "%cb - Black point compensation\n", SW);
-         fprintf(stderr, "%ca<0..1> - Observer adaptation state (abs.col. only)\n\n", SW);
-         fprintf(stderr, "%cl - Use linearization curves (may affect accuracy)\n", SW);
-         fprintf(stderr, "%cr<v.r> - Profile version. (CAUTION: may change the profile implementation)\n", SW);
-         fprintf(stderr, "\n");    
-         fprintf(stderr, "Colorspaces must be paired except Lab/XYZ, that can be interchanged.\n\n");
-
-         fprintf(stderr, "%ch<0,1,2,3> - More help\n", SW);
-         break;
-
-     case 1:
-         PrintBuiltins();
-         break;
-
-     case 2:
-
-         fprintf(stderr, "\nExamples:\n\n"
-             "To create 'devicelink.icm' from a.icc to b.icc:\n"
-             "\tlinkicc a.icc b.icc\n\n"
-             "To create 'out.icc' from sRGB to cmyk.icc:\n"
-             "\tlinkicc -o out.icc *sRGB cmyk.icc\n\n"
-             "To create a sRGB input profile working in Lab:\n"
-             "\tlinkicc -x -o sRGBLab.icc *sRGB *Lab\n\n"
-             "To create a XYZ -> sRGB output profile:\n"
-             "\tlinkicc -x -o sRGBLab.icc *XYZ *sRGB\n\n"
-             "To create a abstract profile doing softproof for cmyk.icc:\n"
-             "\tlinkicc -t1 -x -o softproof.icc *Lab cmyk.icc cmyk.icc *Lab\n\n"
-             "To create a 'grayer' sRGB input profile:\n"
-             "\tlinkicc -x -o grayer.icc *sRGB gray.icc gray.icc *Lab\n\n"
-             "To embed ink limiting into a cmyk output profile:\n"
-             "\tlinkicc -x -o cmyklimited.icc -k 250 cmyk.icc *Lab\n\n");                     
-         break;                       
-
-     case 3:
-
-         fprintf(stderr, "This program is intended to be a demo of the little cms\n"
-             "engine. Both lcms and this program are freeware. You can\n"
-             "obtain both in source code at http://www.littlecms.com\n"
-             "For suggestions, comments, bug reports etc. send mail to\n"
-             "info@littlecms.com\n\n");
-    }
-
-   exit(0);
+    UTILS_UNUSED_PARAMETER(level);
+
+    fprintf(stderr, "\nlinkicc: Links profiles into a single devicelink.\n");
+
+    fprintf(stderr, "\n");
+    fprintf(stderr, "usage: linkicc [flags] <profiles>\n\n");
+    fprintf(stderr, "flags:\n\n");
+    fprintf(stderr, "-o<profile> - Output devicelink profile. [defaults to 'devicelink.icc']\n");
+
+    PrintRenderingIntents();
+
+    fprintf(stderr, "-c<0,1,2> - Precision (0=LowRes, 1=Normal, 2=Hi-res) [defaults to 1]\n");
+    fprintf(stderr, "-n<gridpoints> - Alternate way to set precision, number of CLUT points\n");
+    fprintf(stderr, "-d<description> - description text (quotes can be used)\n");
+    fprintf(stderr, "-y<copyright> - copyright notice (quotes can be used)\n");
+
+    fprintf(stderr, "\n-k<0..400> - Ink-limiting in %% (CMYK only)\n");
+    fprintf(stderr, "-8 - Creates 8-bit devicelink\n");
+    fprintf(stderr, "-x - Creatively, guess deviceclass of resulting profile.\n");
+    fprintf(stderr, "-b - Black point compensation\n");
+    fprintf(stderr, "-a<0..1> - Observer adaptation state (abs.col. only)\n\n");
+    fprintf(stderr, "-l - Use linearization curves (may affect accuracy)\n");
+    fprintf(stderr, "-r<v.r> - Profile version. (CAUTION: may change the profile implementation)\n");
+    fprintf(stderr, "\n");
+    fprintf(stderr, "Colorspaces must be paired except Lab/XYZ, that can be interchanged.\n\n");
+
+    PrintBuiltins();
+
+    fprintf(stderr, "\nExamples:\n\n"
+        "To create 'devicelink.icm' from a.icc to b.icc:\n"
+        "\tlinkicc a.icc b.icc\n\n"
+        "To create 'out.icc' from sRGB to cmyk.icc:\n"
+        "\tlinkicc -o out.icc *sRGB cmyk.icc\n\n"
+        "To create a sRGB input profile working in Lab:\n"
+        "\tlinkicc -x -o sRGBLab.icc *sRGB *Lab\n\n"
+        "To create a XYZ -> sRGB output profile:\n"
+        "\tlinkicc -x -o sRGBLab.icc *XYZ *sRGB\n\n"
+        "To create a abstract profile doing softproof for cmyk.icc:\n"
+        "\tlinkicc -t1 -x -o softproof.icc *Lab cmyk.icc cmyk.icc *Lab\n\n"
+        "To create a 'grayer' sRGB input profile:\n"
+        "\tlinkicc -x -o grayer.icc *sRGB gray.icc gray.icc *Lab\n\n"
+        "To embed ink limiting into a cmyk output profile:\n"
+        "\tlinkicc -x -o cmyklimited.icc -k 250 cmyk.icc *Lab\n\n");
+
+    fprintf(stderr, "This program is intended to be a demo of the Little CMS\n"
+                    "color engine. Both lcms and this program are open source.\n"
+                    "You can obtain both in source code at https://www.littlecms.com\n"
+                    "For suggestions, comments, bug reports etc. send mail to\n"
+                    "info@littlecms.com\n\n");
+
+    exit(0);
 }
 
 // The toggles stuff
@@ -122,115 +108,124 @@ void HandleSwitches(int argc, char *argv[])
 {
     int s;
 
-    while ((s = xgetopt(argc,argv,"a:A:BbC:c:D:d:h:H:k:K:lLn:N:O:o:r:R:T:t:V:v:xX8y:Y:")) != EOF) {
+    while ((s = xgetopt(argc,argv,"a:A:BbC:c:D:d:h:H:k:K:lLn:N:O:o:r:R:T:t:V:v:xX8y:Y:-:")) != EOF) {
 
     switch (s) {
 
+    case '-':
+        if (strcmp(xoptarg, "help") == 0)
+        {
+            Help(0);
+        }
+        else
+        {
+            FatalError("Unknown option - run without args to see valid ones.\n");
+        }
+        break;
+
+    case 'a':
+    case 'A':
+        ObserverAdaptationState = atof(xoptarg);
+        if (ObserverAdaptationState < 0 ||
+            ObserverAdaptationState > 1.0)
+            FatalError("Adaptation state should be 0..1");
+        break;
+
+    case 'b':
+    case 'B':
+        BlackPointCompensation = TRUE;
+        break;
+
+    case 'c':
+    case 'C':
+        PrecalcMode = atoi(xoptarg);
+        if (PrecalcMode < 0 || PrecalcMode > 2) {
+            FatalError("Unknown precalc mode '%d'", PrecalcMode);
+        }
+        break;
+
+    case 'd':
+    case 'D':
+        // Doing that is correct and safe: Description points to memory allocated in the command line.
+        // same for Copyright and output devicelink.
+        Description = xoptarg;
+        break;
+
+    case 'h':
+    case 'H':
+        Help(atoi(xoptarg));
+        return;
+
+    case 'k':
+    case 'K':
+        InkLimit = atof(xoptarg);
+        if (InkLimit < 0.0 || InkLimit > 400.0) {
+            FatalError("Ink limit must be 0%%..400%%");
+        }
+        break;
 
-        case 'a':
-        case 'A':             
-            ObserverAdaptationState = atof(xoptarg);
-            if (ObserverAdaptationState < 0 || 
-                ObserverAdaptationState > 1.0)
-                       FatalError("Adaptation state should be 0..1");
-            break;      
-
-        case 'b':
-        case 'B':
-            BlackPointCompensation = TRUE;
-           break;
-
-        case 'c':
-        case 'C':
-            PrecalcMode = atoi(xoptarg);
-            if (PrecalcMode < 0 || PrecalcMode > 2) {
-                FatalError("Unknown precalc mode '%d'", PrecalcMode);
-            }
-           break;
-
-       case 'd':
-       case 'D':
-           // Doing that is correct and safe: Description points to memory allocated in the command line.
-           // same for Copyright and output devicelink.
-           Description = xoptarg;
-           break;
-
-        case 'h':
-        case 'H':
-            Help(atoi(xoptarg));
-            return;
-
-        case 'k':
-        case 'K':
-            InkLimit = atof(xoptarg);
-            if (InkLimit < 0.0 || InkLimit > 400.0) {
-                FatalError("Ink limit must be 0%%..400%%");
-            }
-           break;
-
-
-        case 'l':
-        case 'L': KeepLinearization = TRUE;
-           break;
-
-       case 'n':
-       case 'N':
-           if (PrecalcMode != 1) {
-               FatalError("Precalc mode already specified");
-           }
-           NumOfGridPoints = atoi(xoptarg);
-           break;
-
-        case 'o':
-        case 'O':
-            cOutProf = xoptarg;
-           break;
-
-
-       case 'r':
-       case 'R':
-          Version = atof(xoptarg);
-          if (Version < 2.0 || Version > 4.3) {
-              fprintf(stderr, "WARNING: lcms was not aware of this version, tag types may be wrong!\n");
-          }
-          break;
-
-        case 't':
-        case 'T':
-            Intent = atoi(xoptarg);  // Will be validated latter on
-            break;
 
-        case 'V':
-        case 'v':
-            Verbose = atoi(xoptarg);
-            if (Verbose < 0 || Verbose > 3) {
-                FatalError("Unknown verbosity level '%d'", Verbose);
-            }
-            break;
+    case 'l':
+    case 'L': KeepLinearization = TRUE;
+        break;
 
-        case '8':
-            lUse8bits = TRUE;
-            break;
+    case 'n':
+    case 'N':
+        if (PrecalcMode != 1) {
+            FatalError("Precalc mode already specified");
+        }
+        NumOfGridPoints = atoi(xoptarg);
+        break;
 
+    case 'o':
+    case 'O':
+        cOutProf = xoptarg;
+        break;
 
 
-        case 'y':
-        case 'Y':
-            Copyright = xoptarg;
-            break;
+    case 'r':
+    case 'R':
+        Version = atof(xoptarg);
+        if (Version < 2.0 || Version > 4.3) {
+            fprintf(stderr, "WARNING: lcms was not aware of this version, tag types may be wrong!\n");
+        }
+        break;
+
+    case 't':
+    case 'T':
+        Intent = atoi(xoptarg);  // Will be validated latter on
+        break;
+
+    case 'V':
+    case 'v':
+        Verbose = atoi(xoptarg);
+        if (Verbose < 0 || Verbose > 3) {
+            FatalError("Unknown verbosity level '%d'", Verbose);
+        }
+        break;
 
+    case '8':
+        lUse8bits = TRUE;
+        break;
 
 
-       case 'x':
-       case 'X': TagResult = TRUE;
-           break;
 
+    case 'y':
+    case 'Y':
+        Copyright = xoptarg;
+        break;
 
-           
-       default:
 
-           FatalError("Unknown option - run without args to see valid ones.\n");          
-        }       
+
+    case 'x':
+    case 'X': TagResult = TRUE;
+        break;
+
+
+    default:
+
+        FatalError("Unknown option - run without args to see valid ones.\n");
+    }
     }
 }
 
@@ -275,7 +270,8 @@ int main(int argc, char *argv[])
     cmsHTRANSFORM hTransform = NULL;
 
     // Here we are
-    fprintf(stderr, "little cms ICC device link generator - v2.2 [LittleCMS %2.2f]\n", LCMS_VERSION / 1000.0);
+    fprintf(stderr, "Little CMS ICC device link generator - v3.0 [LittleCMS %2.2f]\n", LCMS_VERSION / 1000.0);
+    fprintf(stderr, "Copyright (c) 1998-2020 Marti Maria Saguer. See COPYING file for details.\n");
     fflush(stderr);
 
     // Initialize