Merge branch 'feature/upstream' into develop

1 files changed, 150 insertions, 131 deletions

diff --git a/doc/tiffgamut.html b/doc/tiffgamut.html
index fc60c31..534853c 100644..100755
--- a/doc/tiffgamut.html
+++ b/doc/tiffgamut.html
@@ -38,21 +38,22 @@
     See <a href="3dformat.html">3D Viewing Format</a> for switching to
     VRML or X3D output format.<br>
     <h3>Usage Summary</h3>
-    <small><span style="font-family: monospace;">tiffgamut [-v level]
-        [profile.icm | embedded.tif/jpg] infile1.tif/jpg
-        [infile2.tif/jpg ...]</span><br style="font-family: monospace;">
-      <span style="font-family: monospace;">&nbsp;-v&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+    <span style="font-family: monospace;">tiffgamut [-v level]
+      [profile.icm | embedded.tif/jpg] infile1.tif/jpg [infile2.tif/jpg
+      ...]</span><br style="font-family: monospace;">
+    <span style="font-family: monospace;">&nbsp;-v&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 
 
 
 
 
 
-        Verbose</span><br style="font-family: monospace;">
-      &nbsp; <span style="font-family: monospace;">-d
-        sres&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; Surface resolution
-        details 1.0 - 50.0</span><br style="font-family: monospace;">
-      <span style="font-family: monospace;">&nbsp;-w&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+
+      Verbose</span><br style="font-family: monospace;">
+    &nbsp; <span style="font-family: monospace;">-d
+      sres&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; Surface resolution
+      details 1.0 - 50.0</span><br style="font-family: monospace;">
+    <span style="font-family: monospace;">&nbsp;-w&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 emit
 
 
@@ -60,9 +61,10 @@ emit
 
 
 
-        X3DOM .x3d.html file as well as CGATS .gam file</span><br
-        style="font-family: monospace;">
-      <span style="font-family: monospace;">&nbsp;-n&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+
+      X3DOM .x3d.html file as well as CGATS .gam file</span><br
+      style="font-family: monospace;">
+    <span style="font-family: monospace;">&nbsp;-n&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 Don't
 
 
@@ -70,9 +72,10 @@ Don't
 
 
 
-        add X3DOM axes or white/black point</span><br
-        style="font-family: monospace;">
-      <span style="font-family: monospace;">&nbsp;-k&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+
+      add X3DOM axes or white/black point</span><br style="font-family:
+      monospace;">
+    <span style="font-family: monospace;">&nbsp;-k&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 Add
 
 
@@ -80,14 +83,15 @@ Add
 
 
 
-        markers for prim. &amp; sec. "cusp" points<br>
-        &nbsp;-f perc&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; Filter by
-        popularity, perc = percent to use<br style="font-family:
-          monospace;">
-      </span><span style="font-family: monospace;">&nbsp;-i
-        intent&nbsp;&nbsp;&nbsp;&nbsp; p = perceptual, r = relative
-        colorimetric,</span><br style="font-family: monospace;">
-      <span style="font-family: monospace;">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+
+      markers for prim. &amp; sec. "cusp" points<br>
+      &nbsp;-f perc&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; Filter by
+      popularity, perc = percent to use<br style="font-family:
+        monospace;">
+    </span><span style="font-family: monospace;">&nbsp;-i
+      intent&nbsp;&nbsp;&nbsp;&nbsp; p = perceptual, r = relative
+      colorimetric,</span><br style="font-family: monospace;">
+    <span style="font-family: monospace;">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 s
 
 
@@ -95,15 +99,15 @@ s
 
 
 
-        = saturation, a = absolute (default), d = profile default</span></small><small><span
-        style="font-family: monospace;"></span></small><br
-      style="font-family: monospace;">
-    <small><span style="font-family: monospace;"></span><span
-        style="font-family: monospace;">&nbsp;-o
-        order&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; n = normal (priority: lut
-        &gt; matrix &gt; monochrome)</span><br style="font-family:
-        monospace;">
-      <span style="font-family: monospace;">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+
+      = saturation, a = absolute (default), d = profile default</span><span
+      style="font-family: monospace;"></span><br style="font-family:
+      monospace;">
+    <span style="font-family: monospace;"></span><span
+      style="font-family: monospace;">&nbsp;-o
+      order&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; n = normal (priority: lut &gt;
+      matrix &gt; monochrome)</span><br style="font-family: monospace;">
+    <span style="font-family: monospace;">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 r
 
 
@@ -111,19 +115,20 @@ r
 
 
 
-        = reverse (priority: monochrome &gt; matrix &gt; lut)<br>
-      </span></small><small><span style="font-family: monospace;">&nbsp;</span><span
-        style="font-family: monospace;">-p oride</span><span
-        style="font-family: monospace;">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; l
-        = Lab_PCS (default), j = CIECAM02 Appearance Jab</span></small><br
+
+      = reverse (priority: monochrome &gt; matrix &gt; lut)<br>
+    </span><span style="font-family: monospace;">&nbsp;</span><span
+      style="font-family: monospace;">-p oride</span><span
+      style="font-family: monospace;">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; l =
+      Lab_PCS (default), j = CIECAM02 Appearance Jab</span><br
+      style="font-family: monospace;">
+    <span style="font-family: monospace;"></span><span
+      style="font-family: monospace;">&nbsp;-c viewcond&nbsp;&nbsp; set
+      appearance mode and viewing conditions for CIECAM02,</span><br
       style="font-family: monospace;">
-    <small><span style="font-family: monospace;"></span><span
-        style="font-family: monospace;">&nbsp;-c viewcond&nbsp;&nbsp;
-        set appearance mode and viewing conditions for CIECAM02,</span><br
-        style="font-family: monospace;">
-      <span style="font-family: monospace;"></span><span
-        style="font-family: monospace;"></span></small><small><span
-        style="font-family: monospace;">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+    <span style="font-family: monospace;"></span><span
+      style="font-family: monospace;"></span><span style="font-family:
+      monospace;">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 either
 
 
@@ -131,158 +136,172 @@ either
 
 
 
-        an enumerated choice, or a parameter:value change</span><span
-        style="font-family: monospace;"></span><br style="font-family:
-        monospace;">
-      <span style="font-family: monospace;"></span></small><small><span
-        style="font-family: monospace;">&nbsp; &nbsp; &nbsp; &nbsp;
-        &nbsp;&nbsp; pp - Practical Reflection Print (ISO-3664 P2)</span><br
-        style="font-family: monospace;">
-      <span style="font-family: monospace;">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-&nbsp;&nbsp;
 
+      an enumerated choice, or a parameter:value change</span><span
+      style="font-family: monospace;"></span><br style="font-family:
+      monospace;">
+    <span style="font-family: monospace;"></span><tt> &nbsp; &nbsp;
+      &nbsp; &nbsp;&nbsp; &nbsp; </tt><tt><tt>pc - Critical print
+        evaluation environment (ISO-3664 P1)</tt><tt><br>
+        &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; </tt>pp
+      - Practical Reflection Print (ISO-3664 P2)<br>
+      &nbsp; &nbsp; &nbsp; &nbsp;&nbsp; &nbsp; pe - Print evaluation
+      environment (CIE 116-1995)<br>
+    </tt><tt>&nbsp; &nbsp; &nbsp; &nbsp;&nbsp; &nbsp; pm - Print
+      evaluation with partial Mid-tone adaptation</tt><br
+      style="font-family: monospace;">
+    <span style="font-family: monospace;">&nbsp;&nbsp; &nbsp; &nbsp;
+      &nbsp; &nbsp; mt - Monitor in typical work environment</span><br
+      style="font-family: monospace;">
+    <span style="font-family: monospace;">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+&nbsp;
 
 
 
 
 
-        pe - Print evaluation environment (CIE 116-1995)<br>
-      </span></small><small><span style="font-family: monospace;">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-&nbsp;&nbsp;
 
 
+      &nbsp; mb - Monitor in bright work environment</span><br
+      style="font-family: monospace;">
+    <span style="font-family: monospace;">&nbsp;&nbsp;&nbsp;&nbsp;
+      &nbsp; &nbsp;&nbsp;&nbsp; md - Monitor in darkened work
+      environment</span><br style="font-family: monospace;">
+    <span style="font-family: monospace;">&nbsp;&nbsp;&nbsp;&nbsp;
+      &nbsp; &nbsp;&nbsp;&nbsp; jm - Projector in dim environment</span><br
+      style="font-family: monospace;">
+    <span style="font-family: monospace;">&nbsp;&nbsp;&nbsp;&nbsp;
+      &nbsp; &nbsp;&nbsp;&nbsp; jd - Projector in dark environment</span><br
+      style="font-family: monospace;">
+    <span style="font-family: monospace;">&nbsp;&nbsp; &nbsp;&nbsp;
+      &nbsp;&nbsp;&nbsp; pcd - Photo CD - original scene outdoors</span><br
+      style="font-family: monospace;">
+    <span style="font-family: monospace;">&nbsp;&nbsp;&nbsp;&nbsp;
+      &nbsp; &nbsp;&nbsp;&nbsp; ob - Original scene - Bright Outdoors</span><br
+      style="font-family: monospace;">
+    <span style="font-family: monospace;">&nbsp;&nbsp;&nbsp;&nbsp;
+      &nbsp; &nbsp;&nbsp;&nbsp; cx - Cut Sheet Transparencies on a
+      viewing box</span><br style="font-family: monospace;">
+    <span style="font-family: monospace;">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+s:surround&nbsp;&nbsp;
 
 
 
 
-        pc - Critical print evaluation environment (ISO-3664 P1)</span></small><small><span
-        style="font-family: monospace;"></span><span style="font-family:
-        monospace;"></span><br style="font-family: monospace;">
-      <span style="font-family: monospace;">&nbsp;&nbsp; &nbsp; &nbsp;
-        &nbsp; &nbsp; mt - Monitor in typical work environment</span><br
-        style="font-family: monospace;">
-      <span style="font-family: monospace;">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-&nbsp;
 
 
 
+      n = auto, a = average, m = dim, d = dark,</span><br
+      style="font-family: monospace;">
+    <span style="font-family: monospace;">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+&nbsp;
 
 
 
-        &nbsp; mb - Monitor in bright work environment</span><br
-        style="font-family: monospace;">
-      <span style="font-family: monospace;">&nbsp;&nbsp;&nbsp;&nbsp;
-        &nbsp; &nbsp;&nbsp;&nbsp; md - Monitor in darkened work
-        environment</span><br style="font-family: monospace;">
-      <span style="font-family: monospace;">&nbsp;&nbsp;&nbsp;&nbsp;
-        &nbsp; &nbsp;&nbsp;&nbsp; jm - Projector in dim environment</span><br
-        style="font-family: monospace;">
-      <span style="font-family: monospace;">&nbsp;&nbsp;&nbsp;&nbsp;
-        &nbsp; &nbsp;&nbsp;&nbsp; jd - Projector in dark environment</span><br
-        style="font-family: monospace;">
-      <span style="font-family: monospace;">&nbsp;&nbsp; &nbsp;&nbsp;
-        &nbsp;&nbsp;&nbsp; pcd - Photo CD - original scene outdoors</span><br
-        style="font-family: monospace;">
-      <span style="font-family: monospace;">&nbsp;&nbsp;&nbsp;&nbsp;
-        &nbsp; &nbsp;&nbsp;&nbsp; ob - Original scene - Bright Outdoors</span><br
-        style="font-family: monospace;">
-      <span style="font-family: monospace;">&nbsp;&nbsp;&nbsp;&nbsp;
-        &nbsp; &nbsp;&nbsp;&nbsp; cx - Cut Sheet Transparencies on a
-        viewing box</span></small><br style="font-family: monospace;">
-    <small><span style="font-family: monospace;">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-s:surround&nbsp;&nbsp;
 
 
 
 
+      &nbsp; &nbsp;&nbsp; c = transparency (default average)</span><br
+      style="font-family: monospace;">
+    <span style="font-family: monospace;">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+w:X:Y:Z&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 
 
-        n = auto, a = average, m = dim, d = dark,</span><br
-        style="font-family: monospace;">
-      <span style="font-family: monospace;">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-&nbsp;
 
 
 
 
 
+      Adapted white point as XYZ (default media white)</span><br
+      style="font-family: monospace;">
+    <span style="font-family: monospace;">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+w:x:y&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 
-        &nbsp; &nbsp;&nbsp; c = transparency (default average)</span><br
-        style="font-family: monospace;">
-      <span style="font-family: monospace;">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-w:X:Y:Z&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 
 
 
 
 
 
-        Adapted white point as XYZ (default media white)</span><br
-        style="font-family: monospace;">
-      <span style="font-family: monospace;">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-w:x:y&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+      Adapted white point as x, y</span><br style="font-family:
+      monospace;">
+    <span style="font-family: monospace;">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+a:adaptation
 
 
 
 
 
 
-        Adapted white point as x, y</span><br style="font-family:
-        monospace;">
-      <span style="font-family: monospace;">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-a:adaptation
 
+      Adaptation luminance in cd.m^2 (default 50.0)</span><br
+      style="font-family: monospace;">
+    <span style="font-family: monospace;">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+b:background
 
 
 
 
 
-        Adaptation luminance in cd.m^2 (default 50.0)</span><br
-        style="font-family: monospace;">
-      <span style="font-family: monospace;">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-b:background
 
 
+      Background % of image luminance (default 20)<br>
+      &nbsp;&nbsp;&nbsp; &nbsp;&nbsp;&nbsp;&nbsp; l:imagewhite Image
+      white in cd.m^2 if surround = auto (default 250)</span><br
+      style="font-family: monospace;">
+    <span style="font-family: monospace;"><span style="font-family:
+        monospace;">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+        f:flare&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; Flare light % of image
+        luminance (default 1)<br>
+      </span>&nbsp;</span><span style="font-family: monospace;">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 
+      g:glare&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; Glare light % of ambient
+      (default 5)</span><br style="font-family: monospace;">
+    <span style="font-family: monospace;">&nbsp;&nbsp;&nbsp; &nbsp;
+      &nbsp;&nbsp; g:X:Y:Z&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; Glare color as
+      XYZ (default media white)</span><br style="font-family:
+      monospace;">
+    <span style="font-family: monospace;">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 
 
 
-        Background % of image luminance (default 20)<br>
-        &nbsp;&nbsp;&nbsp; &nbsp;&nbsp;&nbsp;&nbsp; l:imagewhite Image
-        white in cd.m^2 if surround = auto (default 250)</span></small><br
-      style="font-family: monospace;">
-    <small><span style="font-family: monospace;"><small><span
-            style="font-family: monospace;">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-f:flare&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 
 
 
+      g:x:y&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; Glare color as x,
+      y</span><br>
+    <span style="font-family: monospace;"><tt><span style="font-family:
+          monospace;"><tt><span style="font-family: monospace;"><span
+                style="font-family: monospace;">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 
+                h:hkscale&nbsp;&nbsp;&nbsp; Helmholtz-Kohlrausch effect
+                scale factor (default 1.0)<br>
+              </span></span><span style="font-family: monospace;">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 
 
-            Flare light % of image luminance (default 1)<br>
-          </span></small>&nbsp;</span><span style="font-family:
-        monospace;">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-        g:glare&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; Glare light % of ambient
-        (default 5)</span><br style="font-family: monospace;">
-      <span style="font-family: monospace;">&nbsp;&nbsp;&nbsp; &nbsp;
-        &nbsp;&nbsp; g:X:Y:Z&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; Glare color
-        as XYZ (default media white)</span><br style="font-family:
-        monospace;">
-      <span style="font-family: monospace;">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 
 
 
+              m:mtaf&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; Mid-tone
+              partial adaptation factor (default 0.0)</span><br
+              style="font-family: monospace;">
+            <span style="font-family: monospace;">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 
+              m:X:Y:Z&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; Mid-tone Adaptation
+              white as XYZ (default D50)</span><br style="font-family:
+              monospace;">
+            <span style="font-family: monospace;">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 
-        g:x:y&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; Glare color as
-        x, y</span></small><br>
-    <small><span style="font-family: monospace;"><small><span
-            style="font-family: monospace;">&nbsp;-x
-            pcent&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; Expand/compress gamut
-            cylindrically by percent</span></small><br>
-        &nbsp;-O outputfile Override the default output filename &amp;
-        extension.<br style="font-family: monospace;">
+              m:x:y&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; Mid-tone
+              Adaptation white as x, y</span></tt></span></tt><br>
+    </span> <span style="font-family: monospace;"><span
+        style="font-family: monospace;">&nbsp;-x
+        pcent&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; Expand/compress gamut
+        cylindrically by percent</span><br>
+      &nbsp;-O outputfile Override the default output filename &amp;
+      extension.</span><small><span style="font-family: monospace;"><br
+          style="font-family: monospace;">
       </span></small><br>
     <h3>Usage Details and Discussion<br>
     </h3>