Merge branch 'release/2.0.0+repack-1'2.0.0+repack-1

1 files changed, 207 insertions, 17 deletions

diff --git a/doc/Scenarios.html b/doc/Scenarios.html
index 8aa5d64..9a55e88 100644..100755
--- a/doc/Scenarios.html
+++ b/doc/Scenarios.html
@@ -75,7 +75,7 @@
         handled when calibration is being used<br>

       </a></h4>

     <h4> <a href="#LP1">Linking Profiles</a></h4>

-    <p>&nbsp;&nbsp;&nbsp; <b><a href="#LP2">Image dependent gamut

+    <p>&nbsp;&nbsp;&nbsp; <b><a href="#LP3">Image dependent gamut

           mapping using device links</a></b><br>

     </p>

     <p>&nbsp;&nbsp;&nbsp; <b><a href="#LP2">Soft Proofing Link</a></b><br>

@@ -186,6 +186,12 @@
 
 
 
+
+
+
+
+
+
 

       and profiling a display that doesn't have VideoLUT access</a>.<br>

     <br>

@@ -270,6 +276,12 @@
 
 
 
+
+
+
+
+
+
 

       -r</span> for an LCD display, or <span style="text-decoration:

       underline; color: rgb(204, 51, 204);">dispcal -yc -r</span> for a

@@ -667,6 +679,12 @@
 
 
 
+
+
+
+
+
+
 

     (<span style="font-weight: bold;">-Iw</span>) changes by doing on

     the fly calibrations during the measurements. Instrument black level

@@ -743,6 +761,12 @@
 
 
 
+
+
+
+
+
+
 

       Correction Matrix</a>. These are specific to a particular

     Colorimeter and Display make and model combination, although a

@@ -751,6 +775,16 @@
       style="font-weight: bold;">ccmx</span> files is <a

       href="ccmxs.html">here</a>.<br>

     <br>

+    Another, more general approach to correcting Colorimeters is to

+    store the spectral sensitivities for each individual instrument in

+    the instrument itself, and then combine that with spectral samples

+    for a particular display type to compute a specific instrument +

+    display correction matrix on the fly (i.e. the i1d3 * Spyder 4 &amp;

+    5 instruments). The display spectral samples can be stored in a <a

+      href="File_Formats.html#.ccss">Colorimeter Correction Spectral

+      Sample</a> file. A list of contributed <span style="font-weight:

+      bold;">ccss</span> files is <a href="ccsss.html">here</a>.<span

+      style="font-weight: bold;"></span><br>

     <h4><a name="PM7"></a>Calibrating and profiling a display that

       doesn't have VideoLUT access.</h4>

     <p>In some situation there is no access to a displays VideoLUT

@@ -825,7 +859,7 @@
       href="cctiff.html#p1">DisplayA.icm</a> <a href="cctiff.html#p2">DisplayA.cal</a>

     <a href="cctiff.html#p3">infile.jpg</a> <a href="cctiff.html#p4">outfile.jpg</a><br>

     <span style="font-weight: bold;"></span><br>

-    <hr size="2" width="100%">

+    <hr width="100%" size="2">

     <h3><a name="PS1"></a>Profiling Scanners and other input devices

       such as cameras<br>

     </h3>

@@ -917,6 +951,12 @@
 
 
 
+
+
+
+
+
+
 

       SG</a> charts:<br>

     <br>

@@ -924,6 +964,12 @@
       width="200" height="122"> <img alt="ColorChecker SG" src="SG.jpg"

       style="width: 174px; height: 122px;"><br>

     <br>

+    A chart provided for camera profiling is the X-Rite <a

+      href="http://xritephoto.com/colorchecker-passport-photo">ColorCheckerPassport</a>:<br>

+    <br>

+    <img alt="ColorChecker Passport" src="Passport.jpg" width="166"

+      height="122"><br>

+    <br>

     The GretagMacbeth Eye-One Pro Scan Target 1.4 can also be used:<br>

     <br>

     <img alt="Eye-One Scan Target 1.4" src="i1scan14.jpg" style="border:

@@ -991,6 +1037,12 @@
 
 
 
+
+
+
+
+
+
 

       HCT</a> :<br>

     <br>

@@ -1073,6 +1125,12 @@
 
 
 
+
+
+
+
+
+
 

       Imaging DCPro Target</a>:<br>

     <br>

@@ -1149,6 +1207,12 @@
 
 
 
+
+
+
+
+
+
 

       201</a>:&nbsp;&nbsp;&nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp;&nbsp; <a

 href="http://www.qpcard.com/en_b2c/color-reference-cards/instant-camera-raw-profiling-with-qpcard-202.html">QPcard
@@ -1207,6 +1271,12 @@ href="http://www.qpcard.com/en_b2c/color-reference-cards/instant-camera-raw-prof
 
 
 
+
+
+
+
+
+
 

       202</a>:<br>

     <br>

@@ -1349,6 +1419,12 @@ href="http://www.xrite.com/documents/apps/public/digital_colorchecker_sg_l_a_b.t
 
 
 
+
+
+
+
+
+
 

         header</a>, and appending <a href="SG_footer.txt">this footer</a>,

       making sure there are no blank lines inserted in the process. Name

@@ -1370,6 +1446,13 @@ href="http://www.xrite.com/documents/apps/public/digital_colorchecker_sg_l_a_b.t
       &nbsp;&nbsp;&nbsp;&nbsp; <a href="spec2cie.html">spec2cie</a>

       ColorCheckerSG.ti3 ColorCheckerSG.cie<br>

       <br>

+      For the full ColortChecker Passport chart, the <b>ref/ColorCheckerPassport.cht</b>

+      file should be used, or if just the 24 patches corresponding to

+      the original ColorChecker are in the shot, the <b>ref/ColorCheckerHalfPassport.cht</b>

+      should be used. A user has kindly provided their measured values

+      for this chart, and they are available in <b>ref/ColorCheckerPassport.cie</b>

+      and <b>ref/ColorCheckerHalfPassport.cie</b> respectively.<br>

+      <br>

       For the Eye-One Pro Scan Target 1.4 chart, the <span

         style="font-weight: bold;"><span style="font-weight: bold;">ref/</span>i1_RGB_Scan_1.4.cht</span>

       file should be used, and as there is no reference file

@@ -1429,6 +1512,12 @@ href="http://www.xrite.com/documents/apps/public/digital_colorchecker_sg_l_a_b.t
 
 
 
+
+
+
+
+
+
 

       </span>file made from measuring a sample chart is also available.

       Alternately you could create your own reference file by

@@ -1510,6 +1599,12 @@ href="http://www.xrite.com/documents/apps/public/digital_colorchecker_sg_l_a_b.t
 
 
 
+
+
+
+
+
+
 

       documentation</a>).<br>

     <br>

@@ -1553,10 +1648,11 @@ href="http://www.xrite.com/documents/apps/public/digital_colorchecker_sg_l_a_b.t
     linearly additive in behaviour.<br>

     <br>

     If the purpose of the input profile is to use it as a substitute for

-    a colorimeter, then the <b>-u</b> flag should be used to avoid

-    clipping values above the white point. Unless the shaper/matrix type

-    profile is a very good fit, it is probably advisable to use a LUT

-    type profile in this situation.<br>

+    a colorimeter, then the <b>-ua</b> flag should be used to force

+    Absolute Colorimetric intent, and avoid clipping colors above the

+    test chart white point. Unless the shaper/matrix type profile is a

+    very good fit, it is probably advisable to use a LUT type profile in

+    this situation.<br>

     <br>

     To create a matrix/shaper profile, the following suffices:<br>

     <br>

@@ -1576,7 +1672,7 @@ href="http://www.xrite.com/documents/apps/public/digital_colorchecker_sg_l_a_b.t
     <br>

     <a href="colprof.html">colprof</a> <a href="colprof.html#v">-v</a>

     <a href="colprof.html#E">-D"Scanner A"</a> <a href="colprof.html#q">-qm</a>

-    <a href="colprof.html#a">-ax</a> <a href="colprof.html#u">-u</a> <a

+    <a href="colprof.html#a">-ax</a> <a href="colprof.html#u">-ua</a> <a

       href="colprof.html#p1">scanner</a><br>

     <br>

     Make sure you check the delta E report at the end of the profile

@@ -1602,7 +1698,7 @@ href="http://www.xrite.com/documents/apps/public/digital_colorchecker_sg_l_a_b.t
       href="colprof.html#p1">scanner</a><br>

     <br>

     <br>

-    <hr size="2" width="100%">

+    <hr width="100%" size="2">

     <h3><a name="PP1"></a>Profiling Printers<br>

     </h3>

     The overall process is to create a set of device measurement target

@@ -1902,7 +1998,7 @@ href="http://www.xrite.com/documents/apps/public/digital_colorchecker_sg_l_a_b.t
     component images, if the scanner or camera is capable of doing so;

     not setting white or black points, using a fixed exposure etc.). It

     is generally advisable to create a LUT type input profile, and use

-    the <a href="http://www.argyllcms.com/doc/colprof.html#u">-u</a>

+    the <a href="http://www.argyllcms.com/doc/colprof.html#ua">-ua</a>

     flag to avoid clipping scanned value whiter than the input

     calibration chart.<br>

     <br>

@@ -1969,6 +2065,12 @@ href="http://www.xrite.com/documents/apps/public/digital_colorchecker_sg_l_a_b.t
 
 
 
+
+
+
+
+
+
 

         scanner or camera must be configured and used exactly the same

         as it was when it was profiled.</span></big><br>

@@ -2055,6 +2157,16 @@ href="http://www.xrite.com/documents/apps/public/digital_colorchecker_sg_l_a_b.t
     the most different gamuts, and hence need the most gamut mapping to

     convert from one colorspace to the other.<br>

     <br>

+    <b>Note</b> that specifying a very large gamut colorspace as the

+    source gamut (i.e. <b>ProPhoto</b> etc.) is probably <u><b>NOT</b></u>

+    what you want to do, since unless the source images have a similar

+    very large gamut to that of the colorspace, they will end up getting

+    over compressed and come out looking dull. Instead use a source

+    profile that has a gamut more representative of the images gamut, <b>or</b>

+    you should provide a gamut using the the <a href="colprof.html#g">-g
+

+      parameter</a>. <br>

+    <br>

     If you are creating a profile for a specific purpose, intending to

     link it to a specific input profile, then you will get the best

     results by specifying that source profile as the source gamut.<br>

@@ -2124,6 +2236,12 @@ then
 
 
 
+
+
+
+
+
+
 

     it can save considerable processing time and space if the -b flag is

     used, and the -S flag not used.<br>

@@ -2271,6 +2389,12 @@ then
 
 
 
+
+
+
+
+
+
 

     and then used <a href="xicclu.html#g">xicclu</a> to explore the

     effect of the parameters.<br>

@@ -2742,6 +2866,12 @@ chart,
 
 
 
+
+
+
+
+
+
 

     and/or to have it included in .ti3 file.<br>

     &nbsp;&nbsp;&nbsp; <a href="cctiff.html#p2">cctiff</a>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
@@ -2814,6 +2944,12 @@ an
 
 
 
+
+
+
+
+
+
 

     image file.<br>

     &nbsp;&nbsp;&nbsp; <a href="applycal.html#p1">applycal</a>&nbsp;&nbsp;&nbsp;&nbsp;
@@ -2878,6 +3014,12 @@ an
 
 
 
+
+
+
+
+
+
 

     To incorporate calibration into an ICC profile.<br>

     &nbsp;&nbsp;&nbsp; <a href="chartread.html#I">chartread</a>&nbsp;&nbsp;
@@ -2950,6 +3092,12 @@ a
 
 
 
+
+
+
+
+
+
 

     profile chart.<br>

     <br>

@@ -3039,7 +3187,7 @@ a
     represent such a physical quantity.<br>

     <br>

     <br>

-    <hr size="2" width="100%">

+    <hr width="100%" size="2">

     <h3><a name="LP1"></a>Linking Profiles</h3>

     Two device profiles can be linked together to create a device link

     profile, than encapsulates a particular device to device transform.

@@ -3217,7 +3365,7 @@ a
       href="collink.html#d">-dmt</a> options, then either leave them out

     or substitute values that do match your environment.<br>

     &nbsp;

-    <hr size="2" width="100%"><br>

+    <hr width="100%" size="2"><br>

     <h3><a name="TR1"></a>Transforming colorspaces of raster files</h3>

     Although a device profile or device link profile may be useful with

     other programs and systems, Argyll provides the tool <a

@@ -3255,7 +3403,7 @@ a
     <a href="cctiff.html#p3">infile.jpg</a> <a href="cctiff.html#p4">outfile.jpg</a><br>

     <br>

     <br>

-    <hr size="2" width="100%"><br>

+    <hr width="100%" size="2"><br>

     <h3><a name="TV1"></a>Creating Video Calibration 3DLuts</h3>

     Video calibration typically involves trying to make your actual

     display device emulate an ideal video display, one which matches

@@ -3297,6 +3445,12 @@ a
 
 
 
+
+
+
+
+
+
 

       madvr</b>" in dispcal, dispread and dispwin. Leave the MadTPG

     "VideoLUT" and "3dluts" buttons in their default&nbsp; (enabled)

@@ -3364,6 +3518,12 @@ a
 
 
 
+
+
+
+
+
+
 

         interactive adjustment mode can be used to set the white point.

         Note that while adjusting the neutral axis for neutrality may

@@ -3403,6 +3563,12 @@ a
 
 
 
+
+
+
+
+
+
 

           of where to apply display per channel calibration curves.</b></li>

       <li>Choose one of the Absolute Colorimetric intents in collink

@@ -3485,7 +3651,7 @@ a
     that the Video card has automatically or manually been configured to

     scale full range RGB values to Video levels for the TV. If the

     latter is not possible, then use the -E options on dispcal and

-    dispread. (See <b>Signal encoding</b> bellow for more details on

+    dispread. (See <b>Signal encoding</b> below for more details on

     this). It may also improve the accuracy of the display profile if

     you use the <a href="dispread.html#Z">dispread -Z</a> option to

     quantize the test values to the precision of the display

@@ -3900,6 +4066,12 @@ a
 
 
 
+
+
+
+
+
+
 

         TV.cal </tt>EBU3213_PAL.icm TV.icm SD_PAL.icm</tt><tt><br>

     </tt><tt> </tt><tt><br>

@@ -3931,6 +4103,12 @@ a
 
 
 
+
+
+
+
+
+
 

         TV.cal </tt>SMPTE_RP145_NTSC.icm TV.icm SD_NTSC.icm</tt><br>

     <br>

@@ -3969,6 +4147,12 @@ a
 
 
 
+
+
+
+
+
+
 

         TV.cal </tt>EBU3213_PAL.icm TV.icm SD_PAL.icm</tt><tt><br>

     </tt><tt> </tt><tt><br>

@@ -4000,6 +4184,12 @@ a
 
 
 
+
+
+
+
+
+
 

         TV.cal </tt>SMPTE_RP145_NTSC.icm TV.icm SD_NTSC.icm</tt><br>

     <br>

@@ -4018,7 +4208,7 @@ a
     the graphics card VideoLUTs in some other fashion.<tt><br>

       <br>

     </tt>

-    <hr size="2" width="100%"><br>

+    <hr width="100%" size="2"><br>

     <h3><a name="TV2"></a>Verifying Video Calibration</h3>

     <p>Often it is desirable to verify the results of a video

       calibration and profile, and the following gives an outline of how

@@ -4060,7 +4250,7 @@ a
       options included "-I b:0.2:2.15" then the equivalent fakeread

       option "-b 0.2:2.15:TV.icm" should be used, etc.<br>

     </p>

-    <hr size="2" width="20%">

+    <hr width="20%" size="2">

     <p>A sanity check we can make at this point is to see what the

       expected result of the profiling &amp; calibration will be, by

       simulating the reproduction of this test set:<br>

@@ -4104,7 +4294,7 @@ a
         checkA.ti3<br>

         <br>

       </tt></p>

-    <hr size="2" width="20%">

+    <hr width="20%" size="2">

     <p>You can explicitly compare the gamuts of your video space and

       your display using the gamut tools:<br>

     </p>

@@ -4119,7 +4309,7 @@ a
       you should use iccgamut <b>-ir</b> instead of <b>-ia</b>, so as

       to align the white points.<br>

     </p>

-    <hr size="2" width="20%">

+    <hr width="20%" size="2">

     <p>The main verification check is to actually measure the display

       response and compare it against the reference. Make sure the

       display is setup as you would for video playback and then use