diff options
| -rw-r--r-- | Readme.txt | 6 | ||||
| -rw-r--r-- | doc/ArgyllDoc.html | 514 | ||||
| -rw-r--r-- | doc/ChangesSummary.html | 22 | ||||
| -rw-r--r-- | doc/instruments.html | 266 | ||||
| -rw-r--r-- | doc/ti3_format.html | 16 | ||||
| -rw-r--r-- | h/aconfig.h | 4 | ||||
| -rw-r--r-- | log.txt | 16 | ||||
| -rw-r--r-- | spectro/conv.c | 5 | ||||
| -rw-r--r-- | spectro/disptechs.c | 109 | ||||
| -rw-r--r-- | spectro/disptechs.h | 3 | ||||
| -rw-r--r-- | spectro/inst.c | 43 | ||||
| -rw-r--r-- | spectro/inst.h | 1 | ||||
| -rw-r--r-- | spectro/linear.cal | 272 | ||||
| -rw-r--r-- | spectro/spec2cie.c | 163 | ||||
| -rw-r--r-- | spectro/strange.cal | 272 | ||||
| -rw-r--r-- | usb/ArgyllCMS.cat | bin | 3551 -> 3551 bytes | |||
| -rw-r--r-- | usb/ArgyllCMS_x64.cat | bin | 3535 -> 3535 bytes | |||
| -rw-r--r-- | xicc/xlut.c | 4 | ||||
| -rw-r--r-- | xicc/xmatrix.c | 3 | ||||
| -rw-r--r-- | xicc/xspect.c | 2 | ||||
| -rw-r--r-- | ziparch.sh | 6 |
21 files changed, 1495 insertions, 232 deletions
@@ -1,8 +1,8 @@ -Argyll CMS README file - Version 1.7.0 +Argyll CMS README file - Version 1.8.2 -------------------------------------- -Date: 1st May 2015 +Date: 7th September 2015 Author: Graeme Gill Introduction @@ -26,7 +26,7 @@ provided for each major tool, and a general guide to using the tools for typical color management tasks is also available. A mailing list provides support for more advanced usage. -This is Version 1.7.0, a feature and bug fix update to V1.6.3. +This is Version 1.8.2, a bug fix update to V1.8.1. The first public release of icclib was in November 1998, and of Argyll was in October 2000. Code development commenced in 1995. See Changes Summary for an overview of changes since the last release. Changes diff --git a/doc/ArgyllDoc.html b/doc/ArgyllDoc.html index 5f617e0..6dda431 100644 --- a/doc/ArgyllDoc.html +++ b/doc/ArgyllDoc.html @@ -10,9 +10,9 @@ <title>Argyll Documentation Top</title>
</head>
<body>
- <h1> Argyll CMS documentation index (V1.8.0)<br>
+ <h1> Argyll CMS documentation index (V1.8.2)<br>
</h1>
- Date: 20th August 2015<br>
+ Date: 7th September 2015<br>
Author: Graeme Gill
<h2><u><a name="Intro"></a>Introduction</u></h2>
ArgyllCMS is an ICC compatible color management system, available as
@@ -34,13 +34,13 @@ provided for each major tool, and a general guide to using the tools
for typical color management tasks is also available. A mailing list
provides support for more advanced usage.<br>
- <p>This is Version 1.8.0, a feature and bug fix update to V1.7.0.
- The first public release of icclib was in November 1998, and of
- Argyll was in October 2000. Code development commenced in 1995.
- See <a href="ChangesSummary.html">Changes Summary</a> for an
- overview of changes since the last release. Changes between
- revisions is detailed in the <b>log.txt</b> file that accompanies
- the source code. </p>
+ <p>This is Version 1.8.2, a bug fix update to V1.8.1. The first
+ public release of icclib was in November 1998, and of Argyll was
+ in October 2000. Code development commenced in 1995. See <a
+ href="ChangesSummary.html">Changes Summary</a> for an overview
+ of changes since the last release. Changes between revisions is
+ detailed in the <b>log.txt</b> file that accompanies the source
+ code. </p>
<p>The latest source code is available from <a
href="http://www.argyllcms.com/">here</a>.<br>
</p>
@@ -102,6 +102,10 @@ + + + + discussion</a> of what color management is, and why we need it,
together with a brief overview of the ICC profile format.<br>
@@ -135,7 +139,7 @@ Linux OpenSuSE 10.3<br>
Linux Whitebox 4.2/2<br>
<p>but may well compile and run correctly in many more than this,
- including OS X 10.8. </p>
+ including OS X 10.8, 10.8 and 10.10. </p>
This is a <span style="font-weight: bold;">command line terminal</span>
only environment. Those unfamiliar with command line environments
should consult an appropriate tutorial for their environment if they
@@ -197,6 +201,10 @@ + + + + - Tele-Spectro-Radiometer<br>
<br>
@@ -251,6 +259,10 @@ + + + + - Tele-Spectro-Radiometer<br>
<br>
@@ -282,6 +294,10 @@ + + + +
@@ -381,6 +397,10 @@ + + + + - "swipe" type reflective spectrometer, that can be used untethered.<br>
<a href="instruments.html#DTP22">DTP22 Digital
@@ -474,6 +494,10 @@ + + + + - spot type reflective spectrometer.<br>
<a href="instruments.html#DTP41">DTP41</a> @@ -566,6 +590,10 @@ + + + + - spot and strip reading reflective spectrometer.<br>
<a href="instruments.html#DTP41">DTP41T</a>
@@ -660,6 +688,10 @@ + + + + - spot and strip reading reflective/transmissive spectrometer.<br>
<a href="instruments.html#dtp51">DTP51</a> @@ -752,6 +784,10 @@ + + + + - strip reading reflective colorimeter.<br>
<a href="instruments.html#DTP92">DTP92</a> @@ -844,6 +880,10 @@ + + + + - CRT display colorimeter.<br>
<a href="instruments.html#DTP94">DTP94</a> <font
@@ -997,6 +1037,10 @@ + + + + - display colorimeter. (Treated as a Eye-One Display 2)<br>
<a href="instruments.html#i1d">CalMAN X2</a>
@@ -1090,6 +1134,10 @@ + + + + - display colorimeter. (Treated as a Eye-One Display 2)<br>
<a href="instruments.html#Huey">Huey</a>
@@ -1192,6 +1240,10 @@ + + + + [The Sequel Chroma 4 may also work.]<br>
<br>
@@ -1286,6 +1338,10 @@ + + + + - see <a href="instruments.html#i1d">Eye-One Display</a><br>
<br>
@@ -1385,6 +1441,10 @@ + + + + [The Spyder 1 has also been reported as working, but this has not
been confirmed.]<br>
@@ -1497,9 +1557,17 @@ + + + + - display colorimeter</span><br>
- <a href="instruments.html#ColorHug">ColorHug</a> + <a href="instruments.html#ColorHug">ColorHug</a> + + + + @@ -1576,10 +1644,12 @@ - display colorimeter<br>
- <a href="instruments.html#SMCube">SwatchMate
- Cube</a> + <a href="instruments.html#SMCube">Palette/SwatchMate + + - - reflective colorimeter<br>
+ Cube</a> -
+ reflective colorimeter<br>
<span style="font-weight: bold;"></span><span class="titre"><br>
See </span><a href="instruments.html">Operation of particular
instruments</a> for more instrument specific detail.<br>
@@ -1636,6 +1706,10 @@ + + + + GNU</span> license <span style="font-weight: bold;">prohibits</span>
extending these tools<span style="font-weight: bold;"></span>
@@ -1782,6 +1856,10 @@ + + + + the jcnf library in <span style="font-weight: bold;">jcnf</span>/, @@ -1872,6 +1950,10 @@ + + + + the files <span style="font-weight: bold;">spectro/xdg_bds.*</span>,
<span style="font-weight: bold;">spectro/aglob.*</span> and the
@@ -2045,6 +2127,10 @@ calibration + + + + and profiling is <a href="http://hoech.net/dispcalGUI/">dispcalGUI</a>
by Florian Höch. Others can be found with a suitable <a
@@ -2145,6 +2231,10 @@ href="http://www.google.com/search?hl=en&source=hp&q=argyllcms+GUI&a + + + + -? </b>(or some other unrecognized flag, if the "?" character is
treated specially in your shell, i.e. try "--" on OS X zsh).<br>
@@ -2252,6 +2342,10 @@ href="http://www.google.com/search?hl=en&source=hp&q=argyllcms+GUI&a + + + + Verbose mode<br>
-d
@@ -2345,6 +2439,10 @@ href="http://www.google.com/search?hl=en&source=hp&q=argyllcms+GUI&a + + + + Choose a depth 0-4<br>
-r
@@ -2438,6 +2536,10 @@ href="http://www.google.com/search?hl=en&source=hp&q=argyllcms+GUI&a + + + + Use a random depth<br>
-f
@@ -2534,6 +2636,10 @@ href="http://www.google.com/search?hl=en&source=hp&q=argyllcms+GUI&a + + + + Manual<br>
infile
@@ -2627,6 +2733,10 @@ href="http://www.google.com/search?hl=en&source=hp&q=argyllcms+GUI&a + + + + Input file<br>
outfile
@@ -2871,6 +2981,10 @@ href="http://www.google.com/search?hl=en&q=windows+command+prompt+tutorial"> + + + + </span><big>Generate a profiling test target values .ti1 file. </big><br
style="font-family: monospace;">
@@ -2965,6 +3079,10 @@ href="http://www.google.com/search?hl=en&q=windows+command+prompt+tutorial"> + + + + film recorder TIFF files from Argyll .ti1 file. </big><br
style="font-family: monospace;">
@@ -3059,6 +3177,10 @@ href="http://www.google.com/search?hl=en&q=windows+command+prompt+tutorial"> + + + + a PS, EPS or TIFF file containing test patch values, ready for
printing.</big></small>
@@ -3155,6 +3277,10 @@ href="http://www.google.com/search?hl=en&q=windows+command+prompt+tutorial"> + + + + a test chart using an instrument to create a .ti3 data file.</big><span
style="font-family: monospace;"> </span><br style="font-family:
@@ -3250,6 +3376,10 @@ href="http://www.google.com/search?hl=en&q=windows+command+prompt+tutorial"> + + + + and read colorimetric values from a display </big><br
style="font-family: monospace;">
@@ -3344,6 +3474,10 @@ href="http://www.google.com/search?hl=en&q=windows+command+prompt+tutorial"> + + + + film colorimetric values using a SpectroScanT (Deprecated ?)</big><br
style="font-family: monospace;">
@@ -3438,6 +3572,10 @@ href="http://www.google.com/search?hl=en&q=windows+command+prompt+tutorial"> + + + + </span><big>Convert a TIFF image of a test chart into .ti3
device values. <br>
@@ -3537,6 +3675,10 @@ href="http://www.google.com/search?hl=en&q=windows+command+prompt+tutorial"> + + + + the reading of a device using an ICC or MPP profile. <br>
</big></small><small><a style="font-family: monospace;"
@@ -3635,6 +3777,10 @@ href="http://www.google.com/search?hl=en&q=windows+command+prompt+tutorial"> + + + + </span><big>Convert Colorblind format CMY/RGB test chart into
Argyll .ti3 CGATS format. </big><br style="font-family:
@@ -3730,6 +3876,10 @@ href="http://www.google.com/search?hl=en&q=windows+command+prompt+tutorial"> + + + + Kodak Colorflow format CMYK test chart into Argyll .ti3 CGATS
format. </big><br style="font-family: monospace;">
@@ -3824,6 +3974,10 @@ href="http://www.google.com/search?hl=en&q=windows+command+prompt+tutorial"> + + + + </span><big>Convert Gretag/Logo/X-Rite/Barbieri or other format
RGB or CMYK test chart results into Argyll .ti3 CGATS format. </big></small><br
@@ -3857,6 +4011,10 @@ href="http://www.google.com/search?hl=en&q=windows+command+prompt+tutorial"> + + + + LightSpace format RGB .bcs test chart results into Argyll
.ti3 CGATS format.</big></small></big><br>
@@ -3951,6 +4109,10 @@ href="http://www.google.com/search?hl=en&q=windows+command+prompt+tutorial"> + + + + </span><big>Create a fake Argyll .ti3 CMY data file from a CMYK
profile, as a basis of creating a CMY to CMYK separation<br>
@@ -3975,6 +4137,10 @@ href="http://www.google.com/search?hl=en&q=windows+command+prompt+tutorial"> + + + + or Merge two or more measurement data files, or average patches
within a single file.</big></small><br>
@@ -4070,6 +4236,10 @@ href="http://www.google.com/search?hl=en&q=windows+command+prompt+tutorial"> + + + + </span></small>Create an ICC profile from the .ti3 test data. <br>
<small><a style="font-family: monospace;" href="mppprof.html">mppprof</a><span
@@ -4163,6 +4333,10 @@ href="http://www.google.com/search?hl=en&q=windows+command+prompt+tutorial"> + + + + </span></small>Create a Model Printer Profile (MPP) from the .ti3
test data. <br>
@@ -4257,6 +4431,10 @@ href="http://www.google.com/search?hl=en&q=windows+command+prompt+tutorial"> + + + + </span></small>Regenerate a device profiles B2A table data by
inverting the A2B table.
@@ -4352,6 +4530,10 @@ href="http://www.google.com/search?hl=en&q=windows+command+prompt+tutorial"> + + + + </span></small>Link two device ICC profiles to create a device
link profile.
@@ -4448,6 +4630,10 @@ href="http://www.google.com/search?hl=en&q=windows+command+prompt+tutorial"> + + + + </span></small>Color convert a TIFF or JPEG file using a sequence
of ICC device, device link, abstract profiles and calibration files.
@@ -4542,6 +4728,10 @@ href="http://www.google.com/search?hl=en&q=windows+command+prompt+tutorial"> + + + + calibration curves to an ICC profile.<br>
<small><a style="font-family: monospace;" href="icclu.html">icclu </a><span
@@ -4635,6 +4825,10 @@ href="http://www.google.com/search?hl=en&q=windows+command+prompt+tutorial"> + + + + </span></small>Lookup individual color values through any ICC
profile table. <br>
@@ -4729,6 +4923,10 @@ href="http://www.google.com/search?hl=en&q=windows+command+prompt+tutorial"> + + + + </span></small>Lookup individual color values forward or inverted
though an ICC profile or CAL table. <br>
@@ -4823,6 +5021,10 @@ href="http://www.google.com/search?hl=en&q=windows+command+prompt+tutorial"> + + + + </span></small>Lookup individual color values though an MPP
profile. Also create MPP gamut files/views.<br>
@@ -4917,6 +5119,10 @@ href="http://www.google.com/search?hl=en&q=windows+command+prompt+tutorial"> + + + + a TIFF file to monochrome using an ICC device profile <br>
<h3>Color Tweaking tools<br>
@@ -5019,6 +5225,10 @@ href="http://www.google.com/search?hl=en&q=windows+command+prompt+tutorial"> + + + + a gamut file or VRML file of the color gamut of an ICC profile. <br>
<small><a style="font-family: monospace;" href="tiffgamut.html">tiffgamut</a><span
@@ -5112,6 +5322,10 @@ href="http://www.google.com/search?hl=en&q=windows+command+prompt+tutorial"> + + + + a gamut file or VRML file of the color gamut of a TIFF or JPEG
image. <br>
@@ -5206,6 +5420,10 @@ href="http://www.google.com/search?hl=en&q=windows+command+prompt+tutorial"> + + + + </span></small>Convert one or more gamuts into a VRML 3D
visualization file. Compute an intersection.<br>
@@ -5302,6 +5520,10 @@ href="http://www.google.com/search?hl=en&q=windows+command+prompt+tutorial"> + + + + </span></small>Dump the contents of an ICC profile as text. <br>
<small><a style="font-family: monospace;" href="profcheck.html">profcheck</a><span
@@ -5395,6 +5617,10 @@ href="http://www.google.com/search?hl=en&q=windows+command+prompt+tutorial"> + + + + an ICC profile against .ti3 test chart data, create pruned .ti3
file.<br>
@@ -5488,6 +5714,10 @@ href="http://www.google.com/search?hl=en&q=windows+command+prompt+tutorial"> + + + + </small>Check ICC forward against inverse lookup. <br>
<small><a style="font-family: monospace;" href="splitti3.html">splitsti3</a><span
@@ -5580,6 +5810,10 @@ href="http://www.google.com/search?hl=en&q=windows+command+prompt+tutorial"> + + + + a CGATS file (ie. a .ti3) into two parts randomly to verify
profiling. <br>
@@ -5677,6 +5911,10 @@ href="http://www.google.com/search?hl=en&q=windows+command+prompt+tutorial"> + + + + an MPP profile against .ti3 test chart data. <br>
<small><a style="font-family: monospace;" href="spotread.html">spotread</a><span
@@ -5769,6 +6007,10 @@ href="http://www.google.com/search?hl=en&q=windows+command+prompt+tutorial"> + + + + an instrument to read a single spot color value. <br>
<small><a style="font-family: monospace;" href="colverify.html">colverify</a><span
@@ -5805,6 +6047,10 @@ href="http://www.google.com/search?hl=en&q=windows+command+prompt+tutorial"> + + + + matching of CIE in two CGATS/.ti3 files (also view differences as
VRML)<br>
@@ -5898,6 +6144,10 @@ href="http://www.google.com/search?hl=en&q=windows+command+prompt+tutorial"> + + + + a synthetic input, display or output calibration (<a
href="File_Formats.html#.cal">.cal</a>)file.
@@ -5992,6 +6242,10 @@ href="http://www.google.com/search?hl=en&q=windows+command+prompt+tutorial"> + + + + a Spectrometer to create a Colorimeter Correction Matrix
(CCMX) or a Colorimeter Calibration Spectral Set (CCSS)
@@ -6088,6 +6342,10 @@ href="http://www.google.com/search?hl=en&q=windows+command+prompt+tutorial"> + + + + an embedded ICC profile from a TIFF or JPEG file.<br>
</small><small><a style="font-family: monospace;"
@@ -6187,6 +6445,10 @@ href="http://www.google.com/search?hl=en&q=windows+command+prompt+tutorial"> + + + + or uninstall display profile, set display calibration from profile
or .cal file, test displace and dispwin access to a display.<br>
@@ -6287,6 +6549,10 @@ href="http://www.google.com/search?hl=en&q=windows+command+prompt+tutorial"> + + + + Plot a spectrum (.sp, .cmf, .ccss) and calculate CCT and VCT.<br>
<small><a style="font-family: monospace;" href="spec2cie.html">spec2cie</a><span
@@ -6381,6 +6647,10 @@ href="http://www.google.com/search?hl=en&q=windows+command+prompt+tutorial"> + + + + reflective spectral .ti3 readings into CIE XYZ and D50 L*a*b*
readings. Apply FWA, plot spectrums.<br>
@@ -6477,6 +6747,10 @@ href="http://www.google.com/search?hl=en&q=windows+command+prompt+tutorial"> + + + + calibration curves to an ICC profile.<br>
<small><a style="font-family: monospace;" href="average.html">average</a><span
@@ -6570,6 +6844,10 @@ href="http://www.google.com/search?hl=en&q=windows+command+prompt+tutorial"> + + + + </span></small><small><big>Average or Merge two or more
measurement data files, or average patches within a single file.</big></small><br>
@@ -6664,6 +6942,10 @@ href="http://www.google.com/search?hl=en&q=windows+command+prompt+tutorial"> + + + + </span></small>Convert Colorblind format CMY/RGB test chart into
Argyll .ti3 CGATS format. <br>
@@ -6758,6 +7040,10 @@ href="http://www.google.com/search?hl=en&q=windows+command+prompt+tutorial"> + + + + </span></small>Color convert a TIFF or JPEG file using a sequence
of ICC device, device link, abstract profiles and calibration files.<br>
@@ -6851,6 +7137,10 @@ href="http://www.google.com/search?hl=en&q=windows+command+prompt+tutorial"> + + + + a Spectrometer to create a Colorimeter Correction Matrix
(CCMX) or a Colorimeter Calibration Spectral Set (CCSS)
@@ -6946,6 +7236,10 @@ href="http://www.google.com/search?hl=en&q=windows+command+prompt+tutorial"> + + + + a test chart using an instrument to create a .ti3 data file. <br>
<small><a style="font-family: monospace;" href="collink.html">collink</a><span
@@ -7039,6 +7333,10 @@ href="http://www.google.com/search?hl=en&q=windows+command+prompt+tutorial"> + + + + </span></small>Link two device ICC profiles to create a device
link profile. <br>
@@ -7133,6 +7431,10 @@ href="http://www.google.com/search?hl=en&q=windows+command+prompt+tutorial"> + + + + </span></small>Create an ICC profile from the .ti3 test data.<br>
<font size="-1"><a style="font-family: monospace;"
@@ -7227,6 +7529,10 @@ href="http://www.google.com/search?hl=en&q=windows+command+prompt+tutorial"> + + + + matching of CIE in two CGATS/.ti3 files (also view differences as
VRML)<br>
@@ -7324,6 +7630,10 @@ href="http://www.google.com/search?hl=en&q=windows+command+prompt+tutorial"> + + + + and read colorimetric values from a display <br>
<small><a style="font-family: monospace;" href="dispwin.html">dispwin</a><span
@@ -7418,6 +7728,10 @@ href="http://www.google.com/search?hl=en&q=windows+command+prompt+tutorial"> + + + + or uninstall display profile, set display calibration from profile
or .cal file, test displace and dispwin access to a display.<br>
@@ -7513,6 +7827,10 @@ href="http://www.google.com/search?hl=en&q=windows+command+prompt+tutorial"> + + + + an embedded ICC profile from a TIFF or JPEG file.<br>
</small><small><a style="font-family: monospace;"
@@ -7611,6 +7929,10 @@ href="http://www.google.com/search?hl=en&q=windows+command+prompt+tutorial"> + + + + </span></small>Create a fake Argyll .ti3 CMY data file from a CMYK
profile, as a basis of creating a CMY to CMYK separation <br>
@@ -7705,6 +8027,10 @@ href="http://www.google.com/search?hl=en&q=windows+command+prompt+tutorial"> + + + + the reading of a device using an ICC or MPP profile. <br>
<small><a style="font-family: monospace;" href="filmread.html">filmread</a><span
@@ -7798,6 +8124,10 @@ href="http://www.google.com/search?hl=en&q=windows+command+prompt+tutorial"> + + + + film colorimetric values using a SpectroScanT (Deprecated ?)<br>
<small><a style="font-family: monospace;" href="filmtarg.html">filmtarg</a><span
@@ -7891,6 +8221,10 @@ href="http://www.google.com/search?hl=en&q=windows+command+prompt+tutorial"> + + + + film recorder TIFF files from Argyll .ti1 file. <br>
<small><a style="font-family: monospace;" href="greytiff.html">greytiff</a><span
@@ -7984,6 +8318,10 @@ href="http://www.google.com/search?hl=en&q=windows+command+prompt+tutorial"> + + + + a TIFF file to monochrome using an ICC device profile <small><a
style="font-family: monospace;" href="oeminst.html"></a></small><br>
@@ -8078,6 +8416,10 @@ href="http://www.google.com/search?hl=en&q=windows+command+prompt+tutorial"> + + + + </span></small>Dump the contents of an ICC profile as text. <br>
<small><a style="font-family: monospace;" href="iccgamut.html">iccgamut</a><span
@@ -8171,6 +8513,10 @@ href="http://www.google.com/search?hl=en&q=windows+command+prompt+tutorial"> + + + + a gamut file or VRML file of the color gamut of an ICC profile. <br>
<small><a style="font-family: monospace;" href="icclu.html">icclu </a><span
@@ -8264,6 +8610,10 @@ href="http://www.google.com/search?hl=en&q=windows+command+prompt+tutorial"> + + + + </span></small>Lookup individual color values through any ICC
profile table. <br>
@@ -8357,6 +8707,10 @@ href="http://www.google.com/search?hl=en&q=windows+command+prompt+tutorial"> + + + + an instrument to measure an illuminant spectrum, and estimate its UV
content.<br>
@@ -8454,6 +8808,10 @@ href="http://www.google.com/search?hl=en&q=windows+command+prompt+tutorial"> + + + + Kodak Colorflow format CMYK test chart into Argyll .ti3 CGATS
format. <br>
@@ -8549,6 +8907,10 @@ href="http://www.google.com/search?hl=en&q=windows+command+prompt+tutorial"> + + + + </span><big>Convert LightSpace format RGB .bcs test chart
results into Argyll .ti3 CGATS format.</big></small></big></small><br>
@@ -8643,6 +9005,10 @@ href="http://www.google.com/search?hl=en&q=windows+command+prompt+tutorial"> + + + + an MPP profile against .ti3 test chart data. <br>
<small><a style="font-family: monospace;" href="mpplu.html">mpplu</a><span
@@ -8736,6 +9102,10 @@ href="http://www.google.com/search?hl=en&q=windows+command+prompt+tutorial"> + + + + </span></small>Lookup individual color values though an MPP
profile. Also create MPP gamut files/views. <br>
@@ -8830,6 +9200,10 @@ href="http://www.google.com/search?hl=en&q=windows+command+prompt+tutorial"> + + + + </span></small>Create a Model Printer Profile (MPP) from the .ti3
test data. <br>
@@ -8928,6 +9302,10 @@ href="http://www.google.com/search?hl=en&q=windows+command+prompt+tutorial"> + + + + a printer calibration .cal file from a .ti3 data file<small><big>.</big></small><br>
<small><a style="font-family: monospace;" href="printtarg.html">printtarg</a><span
@@ -9021,6 +9399,10 @@ href="http://www.google.com/search?hl=en&q=windows+command+prompt+tutorial"> + + + + a PS, EPS or TIFF file containing test patch values, ready for
printing.</big></small><br>
@@ -9115,6 +9497,10 @@ href="http://www.google.com/search?hl=en&q=windows+command+prompt+tutorial"> + + + + an ICC profile against .ti3 test chart data, create pruned .ti3
file.<br>
@@ -9214,6 +9600,10 @@ href="http://www.google.com/search?hl=en&q=windows+command+prompt+tutorial"> + + + + </span></small>Regenerate a device profiles B2A table data by
inverting the A2B table. <br>
@@ -9308,6 +9698,10 @@ href="http://www.google.com/search?hl=en&q=windows+command+prompt+tutorial"> + + + + </span></small>Convert a TIFF image of a test chart into
.ti3 device values. <br>
@@ -9403,6 +9797,10 @@ href="http://www.google.com/search?hl=en&q=windows+command+prompt+tutorial"> + + + + reflective spectral .ti3 readings into CIE XYZ and D50 L*a*b*
readings. Apply FWA, plot spectrums.<br>
@@ -9498,6 +9896,10 @@ href="http://www.google.com/search?hl=en&q=windows+command+prompt+tutorial"> + + + + Plot a spectrum (.sp, .cmf, .ccss) and calculate CCT and VCT.<br>
<small><a style="font-family: monospace;" href="splitti3.html">splitsti3</a><span
@@ -9590,6 +9992,10 @@ href="http://www.google.com/search?hl=en&q=windows+command+prompt+tutorial"> + + + + a CGATS file (ie. a .ti3) into two parts randomly to verify
profiling. <br>
@@ -9683,6 +10089,10 @@ href="http://www.google.com/search?hl=en&q=windows+command+prompt+tutorial"> + + + + an instrument to read a single spot color value. <small><a
style="font-family: monospace;" href="oeminst.html"></a></small><br>
@@ -9776,6 +10186,10 @@ href="http://www.google.com/search?hl=en&q=windows+command+prompt+tutorial"> + + + + a synthetic input, display or output calibration (<a
href="File_Formats.html#.cal">.cal</a>)file.<br>
@@ -9870,6 +10284,10 @@ href="http://www.google.com/search?hl=en&q=windows+command+prompt+tutorial"> + + + + the reading of a device using a synthetic device model. </big></small><br>
<small><a style="font-family: monospace;" href="targen.html">targen</a><span
@@ -9963,6 +10381,10 @@ href="http://www.google.com/search?hl=en&q=windows+command+prompt+tutorial"> + + + + </span></small>Generate a profiling test target values .ti1 file.
<br>
@@ -10057,6 +10479,10 @@ href="http://www.google.com/search?hl=en&q=windows+command+prompt+tutorial"> + + + + a gamut file or VRML file of the color gamut of a TIFF or JPEG
image. <br>
@@ -10155,6 +10581,10 @@ href="http://www.google.com/search?hl=en&q=windows+command+prompt+tutorial"> + + + + </span></small><small><big>Convert Gretag/Logo/X-Rite/Barbieri or
other format RGB or CMYK test chart results into Argyll .ti3
@@ -10250,6 +10680,10 @@ href="http://www.google.com/search?hl=en&q=windows+command+prompt+tutorial"> + + + + one or more gamuts into a VRML 3D visualization file. Compute an
intersection.<br>
@@ -10344,6 +10778,10 @@ href="http://www.google.com/search?hl=en&q=windows+command+prompt+tutorial"> + + + + </span></small>Lookup individual color values forward or inverted
though an ICC profile or CAL table. <br>
@@ -10465,6 +10903,10 @@ href="http://www.google.com/search?hl=en&q=windows+command+prompt+tutorial"> + + + + Device test values <br>
<a href="File_Formats.html#.ti2">.ti2</a> @@ -10557,6 +10999,10 @@ href="http://www.google.com/search?hl=en&q=windows+command+prompt+tutorial"> + + + + Device test values & chart layout <br>
<a href="File_Formats.html#.ti3">.ti3</a> @@ -10649,6 +11095,10 @@ href="http://www.google.com/search?hl=en&q=windows+command+prompt+tutorial"> + + + + Device test values & CIE tristimulus/spectral results <a
href="ti3_format.html">Format details.</a><br>
@@ -10745,6 +11195,10 @@ href="http://www.google.com/search?hl=en&q=windows+command+prompt+tutorial"> + + + + Test chart recognition template. <a href="cht_format.html">Format
details.</a> <br>
@@ -10838,6 +11292,10 @@ href="http://www.google.com/search?hl=en&q=windows+command+prompt+tutorial"> + + + + 3D gamut surface description <br>
<a href="File_Formats.html#.sp">.sp</a> @@ -10930,6 +11388,10 @@ href="http://www.google.com/search?hl=en&q=windows+command+prompt+tutorial"> + + + + Illuminant spectral description <br>
<a href="File_Formats.html#.cmf">.cmf</a>
@@ -11030,6 +11492,10 @@ href="http://www.google.com/search?hl=en&q=windows+command+prompt+tutorial"> + + + + Standard text based data exchange format <br>
<a href="File_Formats.html#ICC">ICC</a> @@ -11122,6 +11588,10 @@ href="http://www.google.com/search?hl=en&q=windows+command+prompt+tutorial"> + + + + International Color Consortium profile format <br>
<a href="File_Formats.html#MPP">MPP</a> @@ -11214,6 +11684,10 @@ href="http://www.google.com/search?hl=en&q=windows+command+prompt+tutorial"> + + + + Model device profile format <br>
<a href="File_Formats.html#TIFF">TIFF</a> @@ -11306,6 +11780,10 @@ href="http://www.google.com/search?hl=en&q=windows+command+prompt+tutorial"> + + + + Tag Image File Format raster files. <br>
<a href="File_Formats.html#JPEG">JPEG</a> @@ -11398,6 +11876,10 @@ href="http://www.google.com/search?hl=en&q=windows+command+prompt+tutorial"> + + + + Joint Photographic Experts Group, JPEG File Interchange Format
raster files. <br>
@@ -11495,6 +11977,10 @@ href="http://www.google.com/search?hl=en&q=windows+command+prompt+tutorial"> + + + + Virtual Reality Modelling Language 3D file format. <br>
<a href="File_Formats.html#X3D">X3D</a>
diff --git a/doc/ChangesSummary.html b/doc/ChangesSummary.html index 559f521..9bf9dca 100644 --- a/doc/ChangesSummary.html +++ b/doc/ChangesSummary.html @@ -16,6 +16,18 @@ <h1> Summary of Argyll CMS Changes since last release</h1> <h3>For a <span style="text-decoration: underline;">complete</span> and more detailed list of changes, please see the log.txt file.</h3> + <h1>[V1.8.1 -> V1.8.2] 7th September 2015</h1> + <ul> + <li>Fixed endless loop bug in alternate calibration selectors + code.</li> + </ul> + <h1>[V1.8.0 -> V1.8.1] 4th September 2015</h1> + <ul> + <li>Fixed bug in "spec2cie -n" wrong field indexes were being + used.</li> + <li>Fixed colorimeter calibration selectors to add in alternate + selectors if the letters are free.</li> + </ul> <h1>[V1.7.0 -> V1.8.0] 20th August 2015</h1> <ul> <li>Added support for the Image Engineering EX1 spectroradiometer.</li> @@ -24,6 +36,10 @@ <li>Added Added Television Lighting Consistency Index (EBU TLCI-2012 Qa) to spotread and specplot output.</li> <li>Added R9 value to CRI value in spotread and specplot output.</li> + <li>Added workaround for JETI specbos having been calibrated by a + 3rd party, and its calibrated range being out of sync with its + claimed range.<br> + </li> <li>Added support for "EMISINPUT" type .ti3 file.</li> <li>Build using OpenSSL rather than axTLS if it is built on Linux.</li> <li>Fixed stack space problem in OS X UI programs by expanding @@ -967,6 +983,9 @@ + + + </span>for systems with > 3Gig Ram.</li> <li>Add support for the Eye-One Monitor spectrometer.</li> <li>Added -L option to <span style="font-weight: bold;">printtarg</span> @@ -1004,6 +1023,9 @@ + + + and memory usage issues.</li> <li>Fixed issues with Eye-One Pro Rev B timeouts.</li> <li>Added new option to collink -fk, that forces 000K input to K diff --git a/doc/instruments.html b/doc/instruments.html index 2a970bd..b493b27 100644 --- a/doc/instruments.html +++ b/doc/instruments.html @@ -45,6 +45,9 @@ + + + - Tele-Spectro-Radiometer<br>
<br>
@@ -101,6 +104,9 @@ + + + - Tele-Spectro-Radiometer<br>
<br>
@@ -159,6 +165,9 @@ + + + - "swipe" type reflective spectrometer, that can be used untethered.<br>
<a href="#DTP22">DTP22 Digital Swatchbook</a> @@ -205,6 +214,9 @@ + + + - spot type reflective spectrometer.<br>
<a href="#DTP41">DTP41</a> @@ -251,6 +263,9 @@ + + + - spot and strip reading reflective spectrometer.<br>
<a href="#DTP41">DTP41T</a>
@@ -299,6 +314,9 @@ + + + - spot and strip reading reflective/transmissive spectrometer.<br>
<a href="#dtp51">DTP51</a> @@ -345,6 +363,9 @@ + + + - strip reading reflective colorimeter.<br>
<a href="#DTP92">DTP92</a> @@ -391,6 +412,9 @@ + + + - CRT display colorimeter.<br>
<a href="#DTP94">DTP94</a> <font size="-1">"Optix @@ -437,6 +461,9 @@ + + + XR"</font> or "Optix XR2" or "Optix Pro"- display colorimeter.<br>
<a href="#ColorMunki"><span style="text-decoration: underline;"></span></a> @@ -483,6 +510,9 @@ + + + <a href="#ColorMunki"><span style="text-decoration: underline;">ColorMunki</span></a>
Design or Photo
@@ -583,6 +613,9 @@ + + + - display colorimeter. (Treated as a Eye-One Display 2)<br>
<a href="#i1d">CalMAN X2</a>
@@ -630,6 +663,9 @@ + + + - display colorimeter. (Treated as a Eye-One Display 2)<br>
<a href="#Huey">Huey</a>
@@ -686,6 +722,9 @@ + + + [The Sequel Chroma 4 may also work.]<br>
<br>
@@ -734,6 +773,9 @@ + + + - see <a href="#i1d">Eye-One Display</a><br>
<br>
@@ -787,6 +829,9 @@ + + + [The Spyder 1 also seems to work.]<br>
<a href="#spyd3">Spyder 3</a>
@@ -852,9 +897,15 @@ + + + - display colorimeter<br>
- </span> <a href="#ColorHug">ColorHug</a> + </span> <a href="#ColorHug">ColorHug</a> + + + @@ -891,8 +942,7 @@ - display colorimeter<span class="titre"></span><br>
- <a href="#SMCube">SwatchMate Cube</a> - + <a href="#SMCube">Palette/SwatchMate Cube</a> - reflective colorimeter<br>
@@ -1211,6 +1261,9 @@ + + + type</span> selection parameter. Depending on the instrument, this
may combine two related functions: 1) Changing the measurement mode
@@ -1258,8 +1311,8 @@ this measurement. A rough guide is as follows:<br>
<br>
</p>
- <table cellpadding="2" cellspacing="2" border="1" height="230"
- width="372">
+ <table border="1" cellpadding="2" cellspacing="2" width="372"
+ height="230">
<tbody>
<tr>
<td valign="top"><b>Instrument</b></td>
@@ -1334,8 +1387,8 @@ style="font-weight: bold;">specbos 1211 and 1201
Tele-Spectro-Radiometer<br>
</span></span></p>
- <img alt="JETI specbos 1211" src="JETI_1211.jpg" height="254"
- width="257">
+ <img alt="JETI specbos 1211" src="JETI_1211.jpg" width="257"
+ height="254">
<p><span style="font-weight: bold;"><br>
</span><span style="font-weight: bold;">Availability:<br>
<br>
@@ -1352,8 +1405,8 @@ <p><span style="font-weight: bold;"><a name="ex1"></a><span
style="font-weight: bold;">Image Engineering EX1<br>
</span></span></p>
- <img alt="Image Engineering EX1" src="EX1.jpg" height="158"
- width="253"> <span style="font-weight: bold;"><br>
+ <img alt="Image Engineering EX1" src="EX1.jpg" width="253"
+ height="158"> <span style="font-weight: bold;"><br>
</span><span style="font-weight: bold;"><br>
Availability:<br>
<br>
@@ -1361,6 +1414,9 @@ href="http://www.image-engineering.de/iq-products/iq-tools/measurement-devices/ex1">Image + + + Engineering EX1</a> is a currently available instruments. This is
a high resolution spectrometer intended for the measurement of light
@@ -1372,7 +1428,7 @@ href="http://www.image-engineering.de/iq-products/iq-tools/measurement-devices/e <p><span style="font-weight: bold;"><a name="k10a"></a><span
style="font-weight: bold;">Klein K10-A Colorimeter<br>
</span></span></p>
- <img alt="Klein K10-A" src="K10A.jpg" height="236" width="267"><br>
+ <img alt="Klein K10-A" src="K10A.jpg" width="267" height="236"><br>
<p><span style="font-weight: bold;"><br>
</span><span style="font-weight: bold;">Availability:<br>
<br>
@@ -1386,6 +1442,9 @@ href="http://www.image-engineering.de/iq-products/iq-tools/measurement-devices/e + + + <a href="http://www.kleininstruments.com/">Klein Instruments</a> @@ -1397,6 +1456,9 @@ href="http://www.image-engineering.de/iq-products/iq-tools/measurement-devices/e + + + is a currently available instrument. It is noted for it's speed,
high precision, and ability to measure to very low light
@@ -1712,6 +1774,9 @@ href="http://www.image-engineering.de/iq-products/iq-tools/measurement-devices/e + + + CRT display A Cathode Ray
Tube display, that is of the Refresh type [Default, CB2].<br>
@@ -1778,6 +1843,9 @@ href="http://www.image-engineering.de/iq-products/iq-tools/measurement-devices/e + + + LCD display A Liquid
Crystal Display, that is of the Non-Refresh type [default, CB1].<br>
@@ -1825,6 +1893,9 @@ href="http://www.image-engineering.de/iq-products/iq-tools/measurement-devices/e + + + CRT display A Cathode Ray
Tube display, that is of the Refresh type [CB2].<br>
@@ -1888,6 +1959,9 @@ Gretag + + + MacBeth (Now X-Rite) is a discontinued instrument. It is often
available second hand. If buying it second hand, make sure it comes
@@ -2137,6 +2211,9 @@ Gretag + + + Smile</span> are:<br>
<br>
@@ -2171,6 +2248,9 @@ Gretag + + + LCD with LED back-light
A Liquid Crystal display that uses
@@ -2222,6 +2302,9 @@ Gretag + + + LCD display A Liquid
Crystal Display, that is of the Non-Refresh type. [Default, CB1]<br>
@@ -2269,6 +2352,9 @@ Gretag + + + CRT display A
Cathode Ray Tube display, that is of the Refresh type. [CB2]<br>
@@ -2335,6 +2421,9 @@ href="http://www8.hp.com/us/en/products/oas/product-detail.html?oid=5225568">HP + + + DreamColor</a> instruments are also reported to work. They will
appear as a be a the same as the i1Display Pro.<br>
@@ -2405,56 +2494,9 @@ href="http://www8.hp.com/us/en/products/oas/product-detail.html?oid=5225568">HP <br>
Availability:<br>
<br>
- </span>The <span style="font-weight: bold;">Huey </span>is widely
- available under the <a href="http://www.pantone.com/">Pantone</a>
- name as well as the manufacturer, <a href="http://www.xrite.com/">X-Rite</a>.
- There lower cost Huey is now discontinued, while the <a
-href="http://www.pantone.com/pages/products/product.aspx?pid=562&ca=2">Huey - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- Pro</a> is still available.<br>
+ </span>The <span style="font-weight: bold;">Huey </span>and <b>Huey
+ Pro</b> are discontinued instruments. They may still be available
+ as old stock, or second hand. <br>
<span style="font-weight: bold;"></span><br>
<span style="font-weight: bold;">Operation:</span><br>
<br>
@@ -2504,6 +2546,9 @@ href="http://www.pantone.com/pages/products/product.aspx?pid=562&ca=2">Huey + + + LCD display A Liquid
Crystal Display, that is of the Non-Refresh type. [Default, CB1]<br>
@@ -2551,6 +2596,9 @@ href="http://www.pantone.com/pages/products/product.aspx?pid=562&ca=2">Huey + + + CRT display A Cathode Ray
Tube display, that is of the Refresh type. [CB2]<br>
@@ -2623,6 +2671,9 @@ href="http://www.pantone.com/pages/products/product.aspx?pid=562&ca=2">Huey + + + CRT display A Cathode Ray
Tube display, that is of the Refresh type.<br>
@@ -2670,6 +2721,9 @@ href="http://www.pantone.com/pages/products/product.aspx?pid=562&ca=2">Huey + + + LCD display A Liquid
Crystal Display, that is of the Non-Refresh type.<br>
@@ -2684,7 +2738,7 @@ href="http://www.pantone.com/pages/products/product.aspx?pid=562&ca=2">Huey <br>
</span>The <span style="font-weight: bold;">Spyder 2 </span><span
style="font-weight: bold;"></span>has been superseded by the
- Spyder 3 & 4, but may be available second hand.<br>
+ Spyder 5, but may be available second hand.<br>
[The Spyder 1 has also been reported as working, but this has not
been confirmed.]<br>
<span style="font-weight: bold;"><br>
@@ -2750,6 +2804,9 @@ href="http://www.pantone.com/pages/products/product.aspx?pid=562&ca=2">Huey + + + LCD display A Liquid Crystal
Display, that is of the Non-Refresh type. [Default, CB1]<br>
@@ -2797,6 +2854,9 @@ href="http://www.pantone.com/pages/products/product.aspx?pid=562&ca=2">Huey + + + CRT display A Cathode Ray
Tube display, that is of the Refresh type. [CB2]<br>
@@ -2826,8 +2886,8 @@ href="http://www.pantone.com/pages/products/product.aspx?pid=562&ca=2">Huey <br>
</span>The <span style="font-weight: bold;">Spyder3Elite</span>, <span
style="font-weight: bold;">Spyder3Pro</span> and <span
- style="font-weight: bold;">Spyder3Express</span> are being
- superseded by the Spyder4, but may still stocked by some dealers,
+ style="font-weight: bold;">Spyder3Express</span> have being
+ superseded by the Spyder 5, but may still stocked by some dealers,
and may be available second hand. The <span style="font-weight:
bold;">Spyder3Elite</span> and <span style="font-weight: bold;">Spyder3Pro</span>
appear to be identical hardware with different software from the
@@ -2869,9 +2929,11 @@ href="http://www.pantone.com/pages/products/product.aspx?pid=562&ca=2">Huey <br>
</span>The <span style="font-weight: bold;">Spyder4Elite</span>, <span
style="font-weight: bold;">Spyder4Pro</span> and <span
- style="font-weight: bold;">Spyder4Express</span> are a currently
- available instruments. The <span style="font-weight: bold;">Spyder4Elite</span>
- and <span style="font-weight: bold;">Spyder4Pro</span> appear to be
+ style="font-weight: bold;">Spyder4Express</span> have being
+ superseded by the Spyder 5, but may still stocked by some dealers,
+ and may be available second hand. The <span
+ style="font-weight: bold;">Spyder4Elite</span> and <span
+ style="font-weight: bold;">Spyder4Pro</span> appear to be
identical hardware with different software from the manufacturer.
The <span style="font-weight: bold;">Spyder4Express</span> lacks
the ambient sensor.<br>
@@ -2967,6 +3029,9 @@ href="http://www.pantone.com/pages/products/product.aspx?pid=562&ca=2">Huey + + + - normal gamut Liquid Crystal Display with standard Cold Cathode
Fluorescent Lamp backlight.<br>
@@ -3023,6 +3088,9 @@ href="http://www.pantone.com/pages/products/product.aspx?pid=562&ca=2">Huey + + + Wide Gamut LCD, RGB LED
Backlight - wide gamut Liquid Crystal Display with RGB LED
@@ -3074,6 +3142,9 @@ href="http://www.pantone.com/pages/products/product.aspx?pid=562&ca=2">Huey + + + - normal gamut Liquid Crystal Display with alternative Cold Cathode
Fluorescent Lamp backlight (Laptop ?)<br>
@@ -3089,7 +3160,7 @@ href="http://www.pantone.com/pages/products/product.aspx?pid=562&ca=2">Huey colorimeter<br>
<br>
<img style="width: 262px; height: 220px;" alt="Spyder4"
- src="Spyd5.jpg" height="350" width="449"> <br>
+ src="Spyd5.jpg" width="449" height="350"> <br>
<br>
</span><span style="font-weight: bold;">Availability:<br>
<br>
@@ -3109,6 +3180,9 @@ href="http://www.pantone.com/pages/products/product.aspx?pid=562&ca=2">Huey + + + Calibration Spectral Sample</a>) files, and this also gives the
instrument the capability of using a non-default standard observer.
@@ -3199,6 +3273,9 @@ href="http://www.pantone.com/pages/products/product.aspx?pid=562&ca=2">Huey + + + - normal gamut Liquid Crystal Display with standard Cold Cathode
Fluorescent Lamp backlight.<br>
@@ -3255,6 +3332,9 @@ href="http://www.pantone.com/pages/products/product.aspx?pid=562&ca=2">Huey + + + Wide Gamut LCD, RGB LED
Backlight - wide gamut Liquid Crystal Display with RGB LED
@@ -3306,6 +3386,9 @@ href="http://www.pantone.com/pages/products/product.aspx?pid=562&ca=2">Huey + + + - normal gamut Liquid Crystal Display with alternative Cold Cathode
Fluorescent Lamp backlight (Laptop ?)<br>
@@ -3367,6 +3450,9 @@ href="http://www.pantone.com/pages/products/product.aspx?pid=562&ca=2">Huey + + + HCFR Probe</span> is a kit instrument from <span
style="font-weight: bold;"></span> <a
@@ -3432,6 +3518,9 @@ href="http://www.pantone.com/pages/products/product.aspx?pid=562&ca=2">Huey + + + LCD display A Liquid
Crystal Display [Default].<br>
@@ -3479,6 +3568,9 @@ href="http://www.pantone.com/pages/products/product.aspx?pid=562&ca=2">Huey + + + CRT display A Cathode Ray
Tube display.<br>
@@ -3490,7 +3582,7 @@ href="http://www.pantone.com/pages/products/product.aspx?pid=562&ca=2">Huey style="font-weight: bold;" class="titre">ColorHug<br>
<br>
<img alt="" src="ColorHug.jpg" style="width: 203px; height:
- 194px;" height="623" width="552"><br>
+ 194px;" width="552" height="623"><br>
<br>
</span><span style="font-weight: bold;">Availability:<br>
<br>
@@ -3526,6 +3618,9 @@ href="http://www.pantone.com/pages/products/product.aspx?pid=562&ca=2">Huey + + + LCD, CCFL Backlight [Default]<br>
<b>c</b> @@ -3543,6 +3638,9 @@ href="http://www.pantone.com/pages/products/product.aspx?pid=562&ca=2">Huey + + + CRT display<br>
<b>p</b> @@ -3560,6 +3658,9 @@ href="http://www.pantone.com/pages/products/product.aspx?pid=562&ca=2">Huey + + + Projector<br>
<b>e</b> @@ -3576,6 +3677,9 @@ href="http://www.pantone.com/pages/products/product.aspx?pid=562&ca=2">Huey + + + LCD, White LED Backlight<br>
<b>F</b> @@ -3593,6 +3697,9 @@ href="http://www.pantone.com/pages/products/product.aspx?pid=562&ca=2">Huey + + + Factory matrix (For Calibration) [CB1]<br>
<b> R</b> @@ -3610,19 +3717,25 @@ href="http://www.pantone.com/pages/products/product.aspx?pid=562&ca=2">Huey + + + Raw Reading (For Factory matrix Calibration) [CB2]<br>
<br>
<hr style="width: 100%; height: 2px;"><br>
- <a name="SMCube"></a><span style="font-weight: bold;">SwatchMate
+ <a name="SMCube"></a><span style="font-weight: bold;">Palette/SwatchMate + + +
Cube<br>
<br>
- <img alt="SwatchMate Cube" src="SMCube.jpg" height="205"
- width="169"><br>
+ <img alt="SwatchMate Cube" src="SMCube.jpg" width="169"
+ height="205"><br>
<br>
</span><span style="font-weight: bold;">Availability:<br>
<br>
- </span>The Cube from <a href="http://www.swatchmate.com/">SwatchMate</a>
+ </span>The Cube from <a href="http://palette.com/cube.html">Palette/SwatchMate</a>
is a currently available entry level Colorimeter, with <a
href="http://www.argyllcms.com/doc2/smcube/smcube1.html">somewhat
limited accuracy</a>. The ArgyllCMS driver provides two
@@ -3636,6 +3749,9 @@ href="http://www.pantone.com/pages/products/product.aspx?pid=562&ca=2">Huey + + + Matt surfaces [Default]<br>
<b>g</b> @@ -3653,12 +3769,18 @@ href="http://www.pantone.com/pages/products/product.aspx?pid=562&ca=2">Huey + + + Gloss surfaces<br>
<b>N</b>
+ + + Native Calibration<br>
<br>
diff --git a/doc/ti3_format.html b/doc/ti3_format.html index 38a1eb7..559aa12 100644 --- a/doc/ti3_format.html +++ b/doc/ti3_format.html @@ -57,6 +57,7 @@ + "<span style="font-weight: bold;">DISPLAY</span>", <span style="font-weight: bold;">"INPUT"</span> or <span style="font-weight: bold;">"EMISINPUT"</span>.<br> @@ -64,7 +65,7 @@ information is from. (An OUTPUT device is typically a printer. An INPUT device is typically a Scanner or Camera with data from a reflective reference chart. An EMISINPUT is a camera with emissive - reference data. ).<br> + rather than reflective reference data. ).<br> <br> An <span style="font-weight: bold;">"OUTPUT"</span> type device may have a <span style="font-weight: bold;">TOTAL_INK_LIMIT</span> @@ -81,6 +82,7 @@ + 119.657745 121.474236".<br> <br> </span>A display device may also have a <span style="font-weight: @@ -171,11 +173,13 @@ Cyan + + C<br> Magenta M<br> @@ -184,36 +188,42 @@ Cyan + Y<br> Black + K<br> Orange + O<br> Red + R<br> Green + G<br> Blue + B<br> White @@ -223,24 +233,28 @@ Cyan + c<br> Light Magenta + m<br> Light Yellow + y<br> Light Black + k<br> Medium Cyan 2c<br> diff --git a/h/aconfig.h b/h/aconfig.h index ccb353d..4b24c82 100644 --- a/h/aconfig.h +++ b/h/aconfig.h @@ -9,8 +9,8 @@ /* minor number = 8 bits */ /* major number = 8 bits */ -#define ARGYLL_VERSION 0x01080 -#define ARGYLL_VERSION_STR "1.8.0" +#define ARGYLL_VERSION 0x01082 +#define ARGYLL_VERSION_STR "1.8.2" /* Maximum file path length */ #define MAXNAMEL 1024 @@ -2,6 +2,19 @@ Argyll CMS change log ===================== +Version 1.8.2 +------------- + +* Fixed endless loop bug in alternate calibration selectors code. + +Version 1.8.1 (4th September 2015) +------------- + +* Fixed bug in "spec2cie -n" wrong field indexes were being used. + +* Fixed colorimeter calibration selectors to add in alternate + selectors if the letters are free. + Version 1.8.0 (20th August 2015) ------------- @@ -19,6 +32,9 @@ Version 1.8.0 (20th August 2015) * Added support for the SwatchMate Cube reflective colorimeter with improved accuracy. +* Added workaround for JETI specbos having been calibrated by a 3rd party, + and its calibrated range being out of sync with its claimed range. + * Fixed stack space problem in OS X UI programs by expanding main thread proxy to have 8MB instead of the default 512K. diff --git a/spectro/conv.c b/spectro/conv.c index 1f4d102..1a8c78b 100644 --- a/spectro/conv.c +++ b/spectro/conv.c @@ -130,11 +130,11 @@ int next_con_char(void) { return c; } -/* Horrible hack to poll stdin when we're not interactive */ +/* Horrible hack to poll stdin when we're not interactive. */ /* This has the drawback that the char and returm must be */ /* written in one operation for the character to be recognised - */ /* trying to do this manually typically doesn't work unless you are */ -/* very fast an lucky. */ +/* very fast and lucky. */ static int th_read_char(void *pp) { char *rp = (char *)pp; HANDLE stdinh; @@ -166,6 +166,7 @@ int poll_con_char(void) { /* any of MSWin's async file read functions, because we */ /* have no way of ensuring that the STD_INPUT_HANDLE has been */ /* opened with FILE_FLAG_OVERLAPPED. Used a thread instead... */ + /* ReOpenFile() would fix this, but it's not available in WinXP, only Visa+ :-( */ if ((getch_thread = new_athread(th_read_char, &c)) != NULL) { HANDLE stdinh; diff --git a/spectro/disptechs.c b/spectro/disptechs.c index d44519c..70e150f 100644 --- a/spectro/disptechs.c +++ b/spectro/disptechs.c @@ -56,7 +56,7 @@ /* We deliberately duplicate the selection characters, */ /* because it's not usual to offer the whole list, just */ -/* a sub-set, which may not clash. */ +/* a sub-set which may not clash. */ /* disptechs_set_sel() should be used to present */ /* unique selectors. */ static disptech_info disptech_info_array[] = { @@ -387,52 +387,72 @@ disptech_info *disptech_get_strid(char *strid) { so we need to do three passes through all the selections. */ -/* Set the selection characters. */ -/* Return NZ if we have not set all selectors */ -/* If a selector is set, its index will be set in usels[], */ -/* and any remaining selection characters deleted. */ -/* If flag == 0, set from just first suggested selector */ -/* If flag == 1, set from just suggested selector */ +/* Append the selection characters. */ +/* If a selector is set, its index will be set in usels[]. */ +/* Remove any used selectors from isel[]. */ +/* If flag == 0, set from just first suggested selector. */ +/* If flag == 1, set from just suggested selectors. */ /* If flag == 2, set from suggested and fallback selectors */ -/* If flag == 3, set from suggested and fallback selectors, and set unset to nul */ -int disptechs_set_sel( +/* If flag == 3, append from suggested selectors */ +void disptechs_set_sel( int flag, /* See above */ int ix, /* Index of entry being set */ - char *sel, /* Pointer to string list of suggested selectors, */ - /* return a single unique selector in string. */ + char *osel, /* Append unique selectors to this string. */ + char *isel, /* Pointer to string list of suggested selectors, */ char *usels, /* char[256] initially -1, to track used selector entry index */ int *k, /* Index of next available selector in asels */ char *asels /* String list of fallback selectors to choose from, in order. */ ) { - char *d, *s, i; + char *iisel = isel, i; -//a1logd(g_log, 1,"disptechs_set_sel: flag %d, ix %d, sel '%s', k %d\n",flag, ix,sel,*k); +//a1logd(g_log, 1,"disptechs_set_sel: flag %d, ix %d, osel '%s', isel '%s', k %d\n",flag, ix,osel,isel,*k); - /* See if this has already been allocated */ - if (usels[*sel] == ix) { -//a1logd(g_log, 1," set OK\n"); - return 0; /* Nothing to do */ + if (flag != 3) { + /* See if we already have a selecor character */ + if (osel[0] != '\000') { +//a1logd(g_log, 1," already set OK\n"); + return; + } + } else { + if (isel[0] == '\000') { +//a1logd(g_log, 1," nothing to set from\n"); + return; /* Nothing to set from */ + } + + /* Get ready to append */ + osel += strlen(osel); } - /* Set from the suggested selectors */ - for (i = 0, s = sel; *s != '\000'; s++, i++) { + /* Set or add from the first unsed suggested selectors */ + for (i = 0; *isel != '\000'; isel++, i++) { if (flag == 0 && i > 0) { //a1logd(g_log, 1," run out of primaries\n"); break; /* Looked at primary */ } - if (usels[*s] == ((char)-1)) { /* If this selector is not currently used */ -//a1logd(g_log, 1," set to '%c' at %d\n", *s, i); - sel[0] = *s; /* Use it */ - sel[1] = '\000'; - usels[*s] = ix; - return 0; + if (usels[*isel] == ((char)-1)) { /* If this selector is not currently used */ +//a1logd(g_log, 1," added to '%c' from %d\n", *isel, i); + osel[0] = *isel; /* Use it */ + osel[1] = '\000'; + usels[osel[0]] = ix; + + /* Remove all used/discarded from isel, in case we are called again. */ + for (isel++; ;isel++, iisel++) { + *iisel = *isel; + if (*isel == '\000') + break; + } + return; } -//a1logd(g_log, 1," sel '%c' at %d is used by ix %d\n", *s, i, usels[*s]); +//a1logd(g_log, 1," sel '%c' at %d is used by ix %d\n", *isel, i, usels[*isel]); } - if (flag <= 2) { -//a1logd(g_log, 1," returning unset\n"); - return 1; + /* If we get here, we haven't managed to add anything from the remaining */ + /* selectors, so mark the candidate list as empty: */ + iisel[0] = '\000'; + + if (flag != 2) { +//a1logd(g_log, 1," returning without add\n"); + return; } /* Get the next unused char in fallback list */ @@ -442,22 +462,16 @@ int disptechs_set_sel( } if (asels[*k] != '\000') { //a1logd(g_log, 1," set int to fallback '%c' at %d\n", asels[*k], *k); - sel[0] = asels[*k]; - sel[1] = '\000'; - usels[sel[0]] = ix; + osel[0] = asels[*k]; + osel[1] = '\000'; + usels[osel[0]] = ix; (*k)++; - return 0; - } - - /* Set any unset to nul */ - if (flag >= 3) { -//a1logd(g_log, 1," clearing\n"); - sel[0] = '\000'; + return; } -//a1logd(g_log, 1," failed\n"); - /* If we got here, we failed */ - return 1; +//a1logd(g_log, 1," returning after fallback without add\n"); + /* If we got here, we failed to add a selector */ + return; } /* Return the display tech list with unique lsel lectors */ @@ -474,18 +488,19 @@ disptech_info *disptech_get_list() { /* Add entries from the static list and their primary selectors */ for (i = 0; list[i].dtech != disptech_end; i++) { -//a1logd(1,"tech[%d] '%s' sels = '%s'\n",i,list[i].desc,list[i].sel); - strcpy(list[i].lsel, list[i].sel); - disptechs_set_sel(0, i, list[i].lsel, usels, &k, asels); +//a1logd(g_log,1,"tech[%d] '%s' sels = '%s'\n",i,list[i].desc,list[i].sel); + strcpy(list[i].isel, list[i].sel); + list[i].lsel[0] = '\000'; + disptechs_set_sel(0, i, list[i].lsel, list[i].isel, usels, &k, asels); } /* Set selectors from secondary */ for (i = 0; list[i].dtech != disptech_end; i++) - disptechs_set_sel(1, i, list[i].lsel, usels, &k, asels); + disptechs_set_sel(1, i, list[i].lsel, list[i].isel, usels, &k, asels); /* Set remainder from fallback */ for (i = 0; list[i].dtech != disptech_end; i++) - disptechs_set_sel(3, i, list[i].lsel, usels, &k, asels); + disptechs_set_sel(2, i, list[i].lsel, list[i].isel, usels, &k, asels); return list; } diff --git a/spectro/disptechs.h b/spectro/disptechs.h index 68245cf..9860eac 100644 --- a/spectro/disptechs.h +++ b/spectro/disptechs.h @@ -114,6 +114,7 @@ struct _disptech_info { /* Private: */ char lsel[10]; /* Unique list selector for ui */ + char isel[10]; /* Candidate selectors */ }; typedef struct _disptech_info disptech_info; @@ -137,7 +138,7 @@ disptech_info *disptech_select(disptech_info *list, char c); /* utility function, used by disptech_get_list & inst_creat_disptype_list() */ /* See disptechs.c for parameter description. */ -int disptechs_set_sel(int flag, int ix, char *sel, char *usels, int *k, char *asels); +void disptechs_set_sel(int flag, int ix, char *osel, char *isel, char *usels, int *k, char *asels); /* - - - - - - - - - - */ /* Display settling time model */ diff --git a/spectro/inst.c b/spectro/inst.c index ba12f9d..949e34f 100644 --- a/spectro/inst.c +++ b/spectro/inst.c @@ -875,9 +875,11 @@ int doccmx /* Add matching installed ccmx files */ usels[i] = ((char)-1); k = 0; /* Next selector index */ + /* First create a list of calibrations and their desired selectors: */ + /* Add entries from the static list and their primary selectors */ /* (We're currently assuming that calibrations that the instrument */ - /* returns are not custom) */ + /* returns are not custom.) */ /* Count the number in the static list. */ for (i = 0; !(sdtlist[i].flags & inst_dtflags_end); i++) { @@ -966,25 +968,52 @@ int doccmx /* Add matching installed ccmx files */ } } + /* Copy candidate selectors to private isel[] list */ + for (i = 0; i < nlist; i++) { + strcpy(list[i].isel, list[i].sel); + list[i].sel[0] = '\000'; + } + + /* Then allocate a slector for each calibration: */ + /* Set selectors from primary for cbid or custom first */ for (i = 0; i < nlist; i++) { if (list[i].cbid > 0 || (list[i].flags & inst_dtflags_custom) != 0) { - disptechs_set_sel(0, i, list[i].sel, usels, &k, asels); + disptechs_set_sel(0, i, list[i].sel, list[i].isel, usels, &k, asels); } } /* Set selectors from primary for rest */ for (i = 0; i < nlist; i++) - disptechs_set_sel(0, i, list[i].sel, usels, &k, asels); + disptechs_set_sel(0, i, list[i].sel, list[i].isel, usels, &k, asels); - /* Set remaining selectors from secondaries */ + /* Set remaining selectors from primaries or secondaries */ for (i = 0; i < nlist; i++) - disptechs_set_sel(1, i, list[i].sel, usels, &k, asels); + disptechs_set_sel(1, i, list[i].sel, list[i].isel, usels, &k, asels); - /* Set remaining from fallback (or give up and set to null) */ + /* Set remaining from fallback */ for (i = 0; i < nlist; i++) { - fail = disptechs_set_sel(3, i, list[i].sel, usels, &k, asels); + disptechs_set_sel(2, i, list[i].sel, list[i].isel, usels, &k, asels); + if (list[i].sel[0] == '\000') + fail = 1; + } + + /* Any calibrations that failed to find a character will be left as a nul string */ + + /* Add alternate selectors if they are free. */ + for (;;) { + int more = 0; + for (i = 0; i < nlist; i++) { + /* Add unused secondaries */ + disptechs_set_sel(3, i, list[i].sel, list[i].isel, usels, &k, asels); + + if (list[i].isel[0] != '\000') { /* Still more secondaries available */ + more = 1; + } + } + if (!more) + break; } if (pndtlist != NULL) diff --git a/spectro/inst.h b/spectro/inst.h index 00dd9b3..d47f7ea 100644 --- a/spectro/inst.h +++ b/spectro/inst.h @@ -390,6 +390,7 @@ typedef struct _inst_disptypesel { /* Private: */ int ix; /* Internal index, */ + char isel[INST_DTYPE_SEL_LEN]; /* String of potential selector characters */ // Stuff for ccss & ccmx char *path; /* Path to ccss or ccmx. NULL if not valid */ diff --git a/spectro/linear.cal b/spectro/linear.cal new file mode 100644 index 0000000..96cad93 --- /dev/null +++ b/spectro/linear.cal @@ -0,0 +1,272 @@ +CAL + +DESCRIPTOR "Argyll Device Calibration Curves" +ORIGINATOR "Argyll synthcal" +CREATED "Mon Sep 07 03:37:56 2015" +DEVICE_CLASS "DISPLAY" +COLOR_REP "RGB" + +NUMBER_OF_FIELDS 4 +BEGIN_DATA_FORMAT +RGB_I RGB_R RGB_G RGB_B +END_DATA_FORMAT + +NUMBER_OF_SETS 256 +BEGIN_DATA +0.00000 0.00000 0.00000 0.00000 +0.00392157 0.00392157 0.00392157 0.00392157 +0.00784314 0.00784314 0.00784314 0.00784314 +0.0117647 0.0117647 0.0117647 0.0117647 +0.0156863 0.0156863 0.0156863 0.0156863 +0.0196078 0.0196078 0.0196078 0.0196078 +0.0235294 0.0235294 0.0235294 0.0235294 +0.0274510 0.0274510 0.0274510 0.0274510 +0.0313725 0.0313725 0.0313725 0.0313725 +0.0352941 0.0352941 0.0352941 0.0352941 +0.0392157 0.0392157 0.0392157 0.0392157 +0.0431373 0.0431373 0.0431373 0.0431373 +0.0470588 0.0470588 0.0470588 0.0470588 +0.0509804 0.0509804 0.0509804 0.0509804 +0.0549020 0.0549020 0.0549020 0.0549020 +0.0588235 0.0588235 0.0588235 0.0588235 +0.0627451 0.0627451 0.0627451 0.0627451 +0.0666667 0.0666667 0.0666667 0.0666667 +0.0705882 0.0705882 0.0705882 0.0705882 +0.0745098 0.0745098 0.0745098 0.0745098 +0.0784314 0.0784314 0.0784314 0.0784314 +0.0823529 0.0823529 0.0823529 0.0823529 +0.0862745 0.0862745 0.0862745 0.0862745 +0.0901961 0.0901961 0.0901961 0.0901961 +0.0941176 0.0941176 0.0941176 0.0941176 +0.0980392 0.0980392 0.0980392 0.0980392 +0.101961 0.101961 0.101961 0.101961 +0.105882 0.105882 0.105882 0.105882 +0.109804 0.109804 0.109804 0.109804 +0.113725 0.113725 0.113725 0.113725 +0.117647 0.117647 0.117647 0.117647 +0.121569 0.121569 0.121569 0.121569 +0.125490 0.125490 0.125490 0.125490 +0.129412 0.129412 0.129412 0.129412 +0.133333 0.133333 0.133333 0.133333 +0.137255 0.137255 0.137255 0.137255 +0.141176 0.141176 0.141176 0.141176 +0.145098 0.145098 0.145098 0.145098 +0.149020 0.149020 0.149020 0.149020 +0.152941 0.152941 0.152941 0.152941 +0.156863 0.156863 0.156863 0.156863 +0.160784 0.160784 0.160784 0.160784 +0.164706 0.164706 0.164706 0.164706 +0.168627 0.168627 0.168627 0.168627 +0.172549 0.172549 0.172549 0.172549 +0.176471 0.176471 0.176471 0.176471 +0.180392 0.180392 0.180392 0.180392 +0.184314 0.184314 0.184314 0.184314 +0.188235 0.188235 0.188235 0.188235 +0.192157 0.192157 0.192157 0.192157 +0.196078 0.196078 0.196078 0.196078 +0.200000 0.200000 0.200000 0.200000 +0.203922 0.203922 0.203922 0.203922 +0.207843 0.207843 0.207843 0.207843 +0.211765 0.211765 0.211765 0.211765 +0.215686 0.215686 0.215686 0.215686 +0.219608 0.219608 0.219608 0.219608 +0.223529 0.223529 0.223529 0.223529 +0.227451 0.227451 0.227451 0.227451 +0.231373 0.231373 0.231373 0.231373 +0.235294 0.235294 0.235294 0.235294 +0.239216 0.239216 0.239216 0.239216 +0.243137 0.243137 0.243137 0.243137 +0.247059 0.247059 0.247059 0.247059 +0.250980 0.250980 0.250980 0.250980 +0.254902 0.254902 0.254902 0.254902 +0.258824 0.258824 0.258824 0.258824 +0.262745 0.262745 0.262745 0.262745 +0.266667 0.266667 0.266667 0.266667 +0.270588 0.270588 0.270588 0.270588 +0.274510 0.274510 0.274510 0.274510 +0.278431 0.278431 0.278431 0.278431 +0.282353 0.282353 0.282353 0.282353 +0.286275 0.286275 0.286275 0.286275 +0.290196 0.290196 0.290196 0.290196 +0.294118 0.294118 0.294118 0.294118 +0.298039 0.298039 0.298039 0.298039 +0.301961 0.301961 0.301961 0.301961 +0.305882 0.305882 0.305882 0.305882 +0.309804 0.309804 0.309804 0.309804 +0.313725 0.313725 0.313725 0.313725 +0.317647 0.317647 0.317647 0.317647 +0.321569 0.321569 0.321569 0.321569 +0.325490 0.325490 0.325490 0.325490 +0.329412 0.329412 0.329412 0.329412 +0.333333 0.333333 0.333333 0.333333 +0.337255 0.337255 0.337255 0.337255 +0.341176 0.341176 0.341176 0.341176 +0.345098 0.345098 0.345098 0.345098 +0.349020 0.349020 0.349020 0.349020 +0.352941 0.352941 0.352941 0.352941 +0.356863 0.356863 0.356863 0.356863 +0.360784 0.360784 0.360784 0.360784 +0.364706 0.364706 0.364706 0.364706 +0.368627 0.368627 0.368627 0.368627 +0.372549 0.372549 0.372549 0.372549 +0.376471 0.376471 0.376471 0.376471 +0.380392 0.380392 0.380392 0.380392 +0.384314 0.384314 0.384314 0.384314 +0.388235 0.388235 0.388235 0.388235 +0.392157 0.392157 0.392157 0.392157 +0.396078 0.396078 0.396078 0.396078 +0.400000 0.400000 0.400000 0.400000 +0.403922 0.403922 0.403922 0.403922 +0.407843 0.407843 0.407843 0.407843 +0.411765 0.411765 0.411765 0.411765 +0.415686 0.415686 0.415686 0.415686 +0.419608 0.419608 0.419608 0.419608 +0.423529 0.423529 0.423529 0.423529 +0.427451 0.427451 0.427451 0.427451 +0.431373 0.431373 0.431373 0.431373 +0.435294 0.435294 0.435294 0.435294 +0.439216 0.439216 0.439216 0.439216 +0.443137 0.443137 0.443137 0.443137 +0.447059 0.447059 0.447059 0.447059 +0.450980 0.450980 0.450980 0.450980 +0.454902 0.454902 0.454902 0.454902 +0.458824 0.458824 0.458824 0.458824 +0.462745 0.462745 0.462745 0.462745 +0.466667 0.466667 0.466667 0.466667 +0.470588 0.470588 0.470588 0.470588 +0.474510 0.474510 0.474510 0.474510 +0.478431 0.478431 0.478431 0.478431 +0.482353 0.482353 0.482353 0.482353 +0.486275 0.486275 0.486275 0.486275 +0.490196 0.490196 0.490196 0.490196 +0.494118 0.494118 0.494118 0.494118 +0.498039 0.498039 0.498039 0.498039 +0.501961 0.501961 0.501961 0.501961 +0.505882 0.505882 0.505882 0.505882 +0.509804 0.509804 0.509804 0.509804 +0.513725 0.513725 0.513725 0.513725 +0.517647 0.517647 0.517647 0.517647 +0.521569 0.521569 0.521569 0.521569 +0.525490 0.525490 0.525490 0.525490 +0.529412 0.529412 0.529412 0.529412 +0.533333 0.533333 0.533333 0.533333 +0.537255 0.537255 0.537255 0.537255 +0.541176 0.541176 0.541176 0.541176 +0.545098 0.545098 0.545098 0.545098 +0.549020 0.549020 0.549020 0.549020 +0.552941 0.552941 0.552941 0.552941 +0.556863 0.556863 0.556863 0.556863 +0.560784 0.560784 0.560784 0.560784 +0.564706 0.564706 0.564706 0.564706 +0.568627 0.568627 0.568627 0.568627 +0.572549 0.572549 0.572549 0.572549 +0.576471 0.576471 0.576471 0.576471 +0.580392 0.580392 0.580392 0.580392 +0.584314 0.584314 0.584314 0.584314 +0.588235 0.588235 0.588235 0.588235 +0.592157 0.592157 0.592157 0.592157 +0.596078 0.596078 0.596078 0.596078 +0.600000 0.600000 0.600000 0.600000 +0.603922 0.603922 0.603922 0.603922 +0.607843 0.607843 0.607843 0.607843 +0.611765 0.611765 0.611765 0.611765 +0.615686 0.615686 0.615686 0.615686 +0.619608 0.619608 0.619608 0.619608 +0.623529 0.623529 0.623529 0.623529 +0.627451 0.627451 0.627451 0.627451 +0.631373 0.631373 0.631373 0.631373 +0.635294 0.635294 0.635294 0.635294 +0.639216 0.639216 0.639216 0.639216 +0.643137 0.643137 0.643137 0.643137 +0.647059 0.647059 0.647059 0.647059 +0.650980 0.650980 0.650980 0.650980 +0.654902 0.654902 0.654902 0.654902 +0.658824 0.658824 0.658824 0.658824 +0.662745 0.662745 0.662745 0.662745 +0.666667 0.666667 0.666667 0.666667 +0.670588 0.670588 0.670588 0.670588 +0.674510 0.674510 0.674510 0.674510 +0.678431 0.678431 0.678431 0.678431 +0.682353 0.682353 0.682353 0.682353 +0.686275 0.686275 0.686275 0.686275 +0.690196 0.690196 0.690196 0.690196 +0.694118 0.694118 0.694118 0.694118 +0.698039 0.698039 0.698039 0.698039 +0.701961 0.701961 0.701961 0.701961 +0.705882 0.705882 0.705882 0.705882 +0.709804 0.709804 0.709804 0.709804 +0.713725 0.713725 0.713725 0.713725 +0.717647 0.717647 0.717647 0.717647 +0.721569 0.721569 0.721569 0.721569 +0.725490 0.725490 0.725490 0.725490 +0.729412 0.729412 0.729412 0.729412 +0.733333 0.733333 0.733333 0.733333 +0.737255 0.737255 0.737255 0.737255 +0.741176 0.741176 0.741176 0.741176 +0.745098 0.745098 0.745098 0.745098 +0.749020 0.749020 0.749020 0.749020 +0.752941 0.752941 0.752941 0.752941 +0.756863 0.756863 0.756863 0.756863 +0.760784 0.760784 0.760784 0.760784 +0.764706 0.764706 0.764706 0.764706 +0.768627 0.768627 0.768627 0.768627 +0.772549 0.772549 0.772549 0.772549 +0.776471 0.776471 0.776471 0.776471 +0.780392 0.780392 0.780392 0.780392 +0.784314 0.784314 0.784314 0.784314 +0.788235 0.788235 0.788235 0.788235 +0.792157 0.792157 0.792157 0.792157 +0.796078 0.796078 0.796078 0.796078 +0.800000 0.800000 0.800000 0.800000 +0.803922 0.803922 0.803922 0.803922 +0.807843 0.807843 0.807843 0.807843 +0.811765 0.811765 0.811765 0.811765 +0.815686 0.815686 0.815686 0.815686 +0.819608 0.819608 0.819608 0.819608 +0.823529 0.823529 0.823529 0.823529 +0.827451 0.827451 0.827451 0.827451 +0.831373 0.831373 0.831373 0.831373 +0.835294 0.835294 0.835294 0.835294 +0.839216 0.839216 0.839216 0.839216 +0.843137 0.843137 0.843137 0.843137 +0.847059 0.847059 0.847059 0.847059 +0.850980 0.850980 0.850980 0.850980 +0.854902 0.854902 0.854902 0.854902 +0.858824 0.858824 0.858824 0.858824 +0.862745 0.862745 0.862745 0.862745 +0.866667 0.866667 0.866667 0.866667 +0.870588 0.870588 0.870588 0.870588 +0.874510 0.874510 0.874510 0.874510 +0.878431 0.878431 0.878431 0.878431 +0.882353 0.882353 0.882353 0.882353 +0.886275 0.886275 0.886275 0.886275 +0.890196 0.890196 0.890196 0.890196 +0.894118 0.894118 0.894118 0.894118 +0.898039 0.898039 0.898039 0.898039 +0.901961 0.901961 0.901961 0.901961 +0.905882 0.905882 0.905882 0.905882 +0.909804 0.909804 0.909804 0.909804 +0.913725 0.913725 0.913725 0.913725 +0.917647 0.917647 0.917647 0.917647 +0.921569 0.921569 0.921569 0.921569 +0.925490 0.925490 0.925490 0.925490 +0.929412 0.929412 0.929412 0.929412 +0.933333 0.933333 0.933333 0.933333 +0.937255 0.937255 0.937255 0.937255 +0.941176 0.941176 0.941176 0.941176 +0.945098 0.945098 0.945098 0.945098 +0.949020 0.949020 0.949020 0.949020 +0.952941 0.952941 0.952941 0.952941 +0.956863 0.956863 0.956863 0.956863 +0.960784 0.960784 0.960784 0.960784 +0.964706 0.964706 0.964706 0.964706 +0.968627 0.968627 0.968627 0.968627 +0.972549 0.972549 0.972549 0.972549 +0.976471 0.976471 0.976471 0.976471 +0.980392 0.980392 0.980392 0.980392 +0.984314 0.984314 0.984314 0.984314 +0.988235 0.988235 0.988235 0.988235 +0.992157 0.992157 0.992157 0.992157 +0.996078 0.996078 0.996078 0.996078 +1.000000 1.000000 1.000000 1.000000 +END_DATA diff --git a/spectro/spec2cie.c b/spectro/spec2cie.c index c9e570c..aa91ebb 100644 --- a/spectro/spec2cie.c +++ b/spectro/spec2cie.c @@ -514,8 +514,10 @@ main(int argc, char *argv[]) { int sidx; /* Sample ID index */ - int ti, ii, Xi, Yi, Zi, Li, ai, bi; + int ti, ii; + int Xi, Yi, Zi, Li, ai, bi; /* CGATS indexes for each field */ int spi[XSPECT_MAX_BANDS]; /* CGATS indexes for each wavelength */ + int oXi, oYi, oZi, oLi, oai, obi; /* CGATS indexes for each ouput field */ xsp2cie *sp2cie; /* Spectral conversion object */ xspect sp; double XYZ[3]; @@ -572,13 +574,17 @@ main(int argc, char *argv[]) /* copy fields to output file (except spectral if nospec) */ for (i = 0; i < icg->t[0].nfields; i++) { - /* See if this is a input spectral field */ - for (j = 0; nospec && j < sp.spec_n; j++) { - if (spi[j] == i) - break; /* Yes it is */ + + if (nospec) { + for (j = 0; nospec && j < sp.spec_n; j++) { + if (spi[j] == i) { + break; /* Yes it is */ + } + } + if (j < sp.spec_n) + continue; /* Skip it */ } - if (nospec == 0 || j >= sp.spec_n) - ocg->add_field (ocg, 0, icg->t[0].fsym[i], icg->t[0].ftype[i]); + ocg->add_field (ocg, 0, icg->t[0].fsym[i], icg->t[0].ftype[i]); } /* create field for XYZ and Lab if not present */ @@ -607,6 +613,13 @@ main(int argc, char *argv[]) if ((bi = ocg->add_field(ocg, 0, "LAB_B", r_t)) < 0) error ("Cannot add field to table"); + oXi = Xi; + oYi = Yi; + oZi = Zi; + oLi = Li; + oai = ai; + obi = bi; + /* allocate elements */ if ((elems = (cgats_set_elem *) @@ -746,25 +759,40 @@ main(int argc, char *argv[]) xspect corr_sp; /* copy all input colums to output (except spectral if nospec) */ - for (jj = j = 0; j < icg->t[0].nfields; j++) { - for (k = 0; nospec && k < sp.spec_n; k++) { - if (spi[k] == j) - break; - } - if (nospec == 0 || k >= sp.spec_n) { - switch (icg->t[0].ftype[j]) { - case r_t: - elems[jj].d = *((double *) icg->t[0].fdata[i][j]); - break; - case i_t: - elems[jj].i = *((int *) icg->t[0].fdata[i][j]); + + if (nospec) { + /* See if this is a spectral field */ + for (k = 0; nospec && k < sp.spec_n; k++) { + if (spi[k] == j) break; - default: - elems[jj].c = (char *) icg->t[0].fdata[i][j]; } - jj++; + + /* It is a spectral field */ + if (k < sp.spec_n) { + continue; /* Skip it */ + } } + + /* Correct the other fields location in output */ + if (j == Xi) oXi = jj; + if (j == Yi) oYi = jj; + if (j == Zi) oZi = jj; + if (j == Li) oLi = jj; + if (j == ai) oai = jj; + if (j == bi) obi = jj; + + switch (icg->t[0].ftype[j]) { + case r_t: + elems[jj].d = *((double *) icg->t[0].fdata[i][j]); + break; + case i_t: + elems[jj].i = *((int *) icg->t[0].fdata[i][j]); + break; + default: + elems[jj].c = (char *) icg->t[0].fdata[i][j]; + } + jj++; } /* Read the spectral values for this patch */ @@ -781,63 +809,16 @@ main(int argc, char *argv[]) /* Write the corrected spectral values for this patch */ if (nospec == 0) { for (j = 0; j < sp.spec_n; j++) { - elems[spi[j]].d = corr_sp.spec[j]; + elems[spi[j]].d = sp.spec[j] = corr_sp.spec[j]; } } -#ifdef ALLOW_PLOT - if (doplot) { - int ii; - double xx[XRES]; - double y1[XRES]; - double y2[XRES]; - double lab[3]; - - icmXYZ2Lab(&icmD50, lab, XYZ); - printf("Patch %d, XYZ = %f %f %f, Lab = %f %f %f\n",i, - XYZ[0], XYZ[1], XYZ[2], lab[0], lab[1], lab[2]); - - /* Plot spectrum out */ - for (ii = 0; ii < XRES; ii++) { - double ww; - - ww = (sp.spec_wl_long - sp.spec_wl_short) - * ((double)ii/(XRES-1.0)) + sp.spec_wl_short; - - xx[ii] = ww; - y1[ii] = value_xspect(&sp, ww); - y2[ii] = 100.0 * value_xspect(&corr_sp, ww); - } - do_plot(xx,y1,y2,NULL,ii); - } -#endif } + + /* No FWA comp */ else { /* Convert it to CIE space */ sp2cie->convert (sp2cie, XYZ, &sp); -#ifdef ALLOW_PLOT - if (doplot) { - int ii; - double xx[XRES]; - double y1[XRES]; - double lab[3]; - - icmXYZ2Lab(&icmD50, lab, XYZ); - printf("Patch %d, XYZ = %f %f %f, Lab = %f %f %f\n",i, - XYZ[0], XYZ[1], XYZ[2], lab[0], lab[1], lab[2]); - - /* Plot spectrum out */ - for (ii = 0; ii < XRES; ii++) { - double ww; - - ww = (sp.spec_wl_long - sp.spec_wl_short) - * ((double)ii/(XRES-1.0)) + sp.spec_wl_short; - - xx[ii] = ww; - y1[ii] = value_xspect(&sp, ww); - } - do_plot(xx,y1,NULL,NULL,ii); - } -#endif + } /* Could use sp2cie->get_cie_il() to get CIE white point */ @@ -846,13 +827,35 @@ main(int argc, char *argv[]) /* This won't work for emmisive though, since get_cie_il() will return 'E' */ icmXYZ2Lab(&icmD50, Lab, XYZ); - elems[Xi].d = XYZ[0] * 100.0; - elems[Yi].d = XYZ[1] * 100.0; - elems[Zi].d = XYZ[2] * 100.0; +#ifdef ALLOW_PLOT + if (doplot) { + int ii; + double xx[XRES]; + double y1[XRES]; + + printf("Patch %d, XYZ = %f %f %f, Lab = %f %f %f\n",i, + XYZ[0], XYZ[1], XYZ[2], Lab[0], Lab[1], Lab[2]); + + /* Plot spectrum out */ + for (ii = 0; ii < XRES; ii++) { + double ww; + + ww = (sp.spec_wl_long - sp.spec_wl_short) + * ((double)ii/(XRES-1.0)) + sp.spec_wl_short; + + xx[ii] = ww; + y1[ii] = value_xspect(&sp, ww); + } + do_plot(xx,y1,NULL,NULL,ii); + } +#endif + elems[oXi].d = XYZ[0] * 100.0; + elems[oYi].d = XYZ[1] * 100.0; + elems[oZi].d = XYZ[2] * 100.0; - elems[Li].d = Lab[0]; - elems[ai].d = Lab[1]; - elems[bi].d = Lab[2]; + elems[oLi].d = Lab[0]; + elems[oai].d = Lab[1]; + elems[obi].d = Lab[2]; ocg->add_setarr(ocg, 0, elems); } @@ -866,7 +869,7 @@ main(int argc, char *argv[]) ocg->del (ocg); /* Clean up */ icg->del (icg); /* Clean up */ - free (elems); + free (elems); } return 0; diff --git a/spectro/strange.cal b/spectro/strange.cal new file mode 100644 index 0000000..406fba4 --- /dev/null +++ b/spectro/strange.cal @@ -0,0 +1,272 @@ +CAL + +DESCRIPTOR "Argyll Device Calibration Curves" +ORIGINATOR "Argyll synthcal" +CREATED "Mon Sep 07 03:37:56 2015" +DEVICE_CLASS "DISPLAY" +COLOR_REP "RGB" + +NUMBER_OF_FIELDS 4 +BEGIN_DATA_FORMAT +RGB_I RGB_R RGB_G RGB_B +END_DATA_FORMAT + +NUMBER_OF_SETS 256 +BEGIN_DATA +0.00000 0.00000 0.00000 0.00000 +0.00392157 0.0000567518 0.0118787 0.0186065 +0.00784314 0.000184387 0.0206820 0.0302263 +0.0117647 0.000367355 0.0286065 0.0401466 +0.0156863 0.000599076 0.0360094 0.0491028 +0.0196078 0.000875445 0.0430471 0.0574042 +0.0235294 0.00119354 0.0498068 0.0652184 +0.0274510 0.00155112 0.0563438 0.0726496 +0.0313725 0.00194640 0.0626960 0.0797678 +0.0352941 0.00237789 0.0688909 0.0866232 +0.0392157 0.00284433 0.0749493 0.0932533 +0.0431373 0.00334462 0.0808876 0.0996872 +0.0470588 0.00387782 0.0867187 0.105948 +0.0509804 0.00444307 0.0924533 0.112053 +0.0549020 0.00503962 0.0981003 0.118020 +0.0588235 0.00566676 0.103667 0.123859 +0.0627451 0.00632388 0.109160 0.129583 +0.0666667 0.00701040 0.114585 0.135201 +0.0705882 0.00772579 0.119946 0.140720 +0.0745098 0.00846956 0.125248 0.146148 +0.0784314 0.00924125 0.130494 0.151490 +0.0823529 0.0100404 0.135689 0.156754 +0.0862745 0.0108667 0.140834 0.161942 +0.0901961 0.0117197 0.145932 0.167061 +0.0941176 0.0125991 0.150986 0.172112 +0.0980392 0.0135045 0.155998 0.177102 +0.101961 0.0144356 0.160971 0.182031 +0.105882 0.0153921 0.165905 0.186904 +0.109804 0.0163738 0.170803 0.191723 +0.113725 0.0173803 0.175665 0.196491 +0.117647 0.0184114 0.180495 0.201210 +0.121569 0.0194668 0.185292 0.205882 +0.125490 0.0205464 0.190059 0.210508 +0.129412 0.0216498 0.194796 0.215092 +0.133333 0.0227769 0.199504 0.219634 +0.137255 0.0239274 0.204184 0.224136 +0.141176 0.0251012 0.208838 0.228600 +0.145098 0.0262980 0.213466 0.233027 +0.149020 0.0275177 0.218069 0.237418 +0.152941 0.0287600 0.222648 0.241774 +0.156863 0.0300249 0.227204 0.246097 +0.160784 0.0313121 0.231737 0.250388 +0.164706 0.0326215 0.236248 0.254647 +0.168627 0.0339528 0.240737 0.258876 +0.172549 0.0353061 0.245205 0.263076 +0.176471 0.0366810 0.249654 0.267247 +0.180392 0.0380775 0.254082 0.271391 +0.184314 0.0394954 0.258491 0.275507 +0.188235 0.0409345 0.262882 0.279597 +0.192157 0.0423948 0.267254 0.283662 +0.196078 0.0438762 0.271609 0.287702 +0.200000 0.0453784 0.275946 0.291718 +0.203922 0.0469014 0.280266 0.295710 +0.207843 0.0484450 0.284570 0.299680 +0.211765 0.0500091 0.288857 0.303627 +0.215686 0.0515937 0.293128 0.307552 +0.219608 0.0531985 0.297384 0.311455 +0.223529 0.0548235 0.301625 0.315338 +0.227451 0.0564686 0.305851 0.319201 +0.231373 0.0581337 0.310063 0.323043 +0.235294 0.0598187 0.314260 0.326866 +0.239216 0.0615234 0.318443 0.330670 +0.243137 0.0632478 0.322613 0.334456 +0.247059 0.0649918 0.326769 0.338223 +0.250980 0.0667553 0.330911 0.341972 +0.254902 0.0685382 0.335041 0.345703 +0.258824 0.0703403 0.339159 0.349418 +0.262745 0.0721617 0.343264 0.353115 +0.266667 0.0740022 0.347356 0.356797 +0.270588 0.0758618 0.351437 0.360461 +0.274510 0.0777403 0.355505 0.364110 +0.278431 0.0796377 0.359563 0.367744 +0.282353 0.0815539 0.363608 0.371362 +0.286275 0.0834889 0.367643 0.374965 +0.290196 0.0854424 0.371666 0.378553 +0.294118 0.0874146 0.375679 0.382127 +0.298039 0.0894052 0.379681 0.385686 +0.301961 0.0914143 0.383672 0.389231 +0.305882 0.0934417 0.387653 0.392763 +0.309804 0.0954873 0.391624 0.396281 +0.313725 0.0975512 0.395585 0.399786 +0.317647 0.0996332 0.399536 0.403277 +0.321569 0.101733 0.403477 0.406756 +0.325490 0.103851 0.407409 0.410222 +0.329412 0.105987 0.411331 0.413676 +0.333333 0.108141 0.415244 0.417117 +0.337255 0.110313 0.419147 0.420546 +0.341176 0.112503 0.423042 0.423963 +0.345098 0.114710 0.426927 0.427368 +0.349020 0.116935 0.430804 0.430762 +0.352941 0.119177 0.434672 0.434144 +0.356863 0.121437 0.438532 0.437515 +0.360784 0.123714 0.442383 0.440875 +0.364706 0.126009 0.446225 0.444224 +0.368627 0.128321 0.450060 0.447563 +0.372549 0.130650 0.453886 0.450890 +0.376471 0.132997 0.457704 0.454207 +0.380392 0.135360 0.461514 0.457514 +0.384314 0.137741 0.465317 0.460811 +0.388235 0.140139 0.469111 0.464097 +0.392157 0.142554 0.472898 0.467374 +0.396078 0.144986 0.476678 0.470641 +0.400000 0.147435 0.480450 0.473898 +0.403922 0.149900 0.484214 0.477145 +0.407843 0.152383 0.487972 0.480383 +0.411765 0.154882 0.491722 0.483612 +0.415686 0.157398 0.495465 0.486831 +0.419608 0.159931 0.499200 0.490042 +0.423529 0.162480 0.502929 0.493243 +0.427451 0.165046 0.506651 0.496436 +0.431373 0.167628 0.510366 0.499619 +0.435294 0.170227 0.514075 0.502794 +0.439216 0.172842 0.517776 0.505961 +0.443137 0.175474 0.521472 0.509119 +0.447059 0.178122 0.525160 0.512269 +0.450980 0.180787 0.528842 0.515410 +0.454902 0.183467 0.532518 0.518543 +0.458824 0.186164 0.536187 0.521668 +0.462745 0.188877 0.539850 0.524785 +0.466667 0.191606 0.543507 0.527895 +0.470588 0.194351 0.547158 0.530996 +0.474510 0.197113 0.550803 0.534090 +0.478431 0.199890 0.554441 0.537176 +0.482353 0.202684 0.558074 0.540254 +0.486275 0.205493 0.561701 0.543325 +0.490196 0.208318 0.565322 0.546388 +0.494118 0.211159 0.568937 0.549444 +0.498039 0.214016 0.572547 0.552493 +0.501961 0.216889 0.576150 0.555535 +0.505882 0.219777 0.579748 0.558569 +0.509804 0.222681 0.583341 0.561597 +0.513725 0.225601 0.586928 0.564617 +0.517647 0.228536 0.590510 0.567631 +0.521569 0.231487 0.594086 0.570638 +0.525490 0.234454 0.597657 0.573638 +0.529412 0.237436 0.601222 0.576631 +0.533333 0.240434 0.604782 0.579618 +0.537255 0.243447 0.608337 0.582598 +0.541176 0.246476 0.611887 0.585571 +0.545098 0.249520 0.615431 0.588538 +0.549020 0.252579 0.618971 0.591499 +0.552941 0.255654 0.622505 0.594453 +0.556863 0.258744 0.626035 0.597401 +0.560784 0.261849 0.629559 0.600343 +0.564706 0.264970 0.633079 0.603279 +0.568627 0.268105 0.636594 0.606208 +0.572549 0.271256 0.640103 0.609132 +0.576471 0.274422 0.643608 0.612049 +0.580392 0.277603 0.647109 0.614961 +0.584314 0.280800 0.650604 0.617867 +0.588235 0.284011 0.654095 0.620766 +0.592157 0.287237 0.657581 0.623661 +0.596078 0.290478 0.661063 0.626549 +0.600000 0.293735 0.664540 0.629431 +0.603922 0.297006 0.668012 0.632308 +0.607843 0.300292 0.671480 0.635180 +0.611765 0.303593 0.674944 0.638045 +0.615686 0.306909 0.678403 0.640906 +0.619608 0.310239 0.681857 0.643761 +0.623529 0.313585 0.685308 0.646610 +0.627451 0.316945 0.688754 0.649454 +0.631373 0.320320 0.692195 0.652293 +0.635294 0.323709 0.695633 0.655126 +0.639216 0.327114 0.699066 0.657954 +0.643137 0.330533 0.702495 0.660777 +0.647059 0.333966 0.705919 0.663595 +0.650980 0.337414 0.709340 0.666408 +0.654902 0.340877 0.712756 0.669215 +0.658824 0.344354 0.716169 0.672018 +0.662745 0.347846 0.719577 0.674816 +0.666667 0.351352 0.722981 0.677608 +0.670588 0.354873 0.726381 0.680396 +0.674510 0.358408 0.729778 0.683179 +0.678431 0.361958 0.733170 0.685957 +0.682353 0.365522 0.736559 0.688730 +0.686275 0.369100 0.739943 0.691498 +0.690196 0.372693 0.743324 0.694262 +0.694118 0.376300 0.746701 0.697021 +0.698039 0.379921 0.750074 0.699775 +0.701961 0.383557 0.753443 0.702525 +0.705882 0.387207 0.756808 0.705270 +0.709804 0.390871 0.760170 0.708010 +0.713725 0.394549 0.763528 0.710746 +0.717647 0.398242 0.766882 0.713477 +0.721569 0.401948 0.770233 0.716204 +0.725490 0.405669 0.773580 0.718927 +0.729412 0.409404 0.776923 0.721645 +0.733333 0.413153 0.780263 0.724358 +0.737255 0.416916 0.783599 0.727068 +0.741176 0.420693 0.786932 0.729773 +0.745098 0.424484 0.790261 0.732473 +0.749020 0.428289 0.793587 0.735170 +0.752941 0.432108 0.796909 0.737862 +0.756863 0.435940 0.800228 0.740550 +0.760784 0.439787 0.803543 0.743234 +0.764706 0.443648 0.806855 0.745914 +0.768627 0.447523 0.810164 0.748589 +0.772549 0.451411 0.813469 0.751261 +0.776471 0.455314 0.816770 0.753928 +0.780392 0.459230 0.820069 0.756592 +0.784314 0.463160 0.823364 0.759251 +0.788235 0.467103 0.826656 0.761906 +0.792157 0.471061 0.829944 0.764558 +0.796078 0.475032 0.833230 0.767205 +0.800000 0.479017 0.836512 0.769849 +0.803922 0.483016 0.839790 0.772489 +0.807843 0.487028 0.843066 0.775124 +0.811765 0.491054 0.846339 0.777756 +0.815686 0.495094 0.849608 0.780385 +0.819608 0.499147 0.852874 0.783009 +0.823529 0.503214 0.856137 0.785630 +0.827451 0.507294 0.859397 0.788247 +0.831373 0.511388 0.862654 0.790860 +0.835294 0.515496 0.865908 0.793469 +0.839216 0.519617 0.869158 0.796075 +0.843137 0.523751 0.872406 0.798677 +0.847059 0.527899 0.875651 0.801276 +0.850980 0.532061 0.878892 0.803871 +0.854902 0.536236 0.882131 0.806462 +0.858824 0.540424 0.885367 0.809050 +0.862745 0.544626 0.888599 0.811634 +0.866667 0.548841 0.891829 0.814215 +0.870588 0.553070 0.895056 0.816792 +0.874510 0.557311 0.898280 0.819366 +0.878431 0.561567 0.901501 0.821936 +0.882353 0.565835 0.904719 0.824503 +0.886275 0.570117 0.907935 0.827066 +0.890196 0.574412 0.911147 0.829626 +0.894118 0.578721 0.914357 0.832183 +0.898039 0.583042 0.917564 0.834736 +0.901961 0.587377 0.920768 0.837286 +0.905882 0.591725 0.923969 0.839833 +0.909804 0.596087 0.927168 0.842376 +0.913725 0.600461 0.930363 0.844916 +0.917647 0.604849 0.933556 0.847453 +0.921569 0.609249 0.936747 0.849986 +0.925490 0.613663 0.939934 0.852516 +0.929412 0.618090 0.943119 0.855044 +0.933333 0.622530 0.946301 0.857567 +0.937255 0.626984 0.949481 0.860088 +0.941176 0.631450 0.952658 0.862606 +0.945098 0.635929 0.955832 0.865120 +0.949020 0.640421 0.959003 0.867631 +0.952941 0.644927 0.962172 0.870139 +0.956863 0.649445 0.965339 0.872644 +0.960784 0.653976 0.968502 0.875146 +0.964706 0.658521 0.971664 0.877645 +0.968627 0.663078 0.974822 0.880141 +0.972549 0.667648 0.977978 0.882634 +0.976471 0.672231 0.981132 0.885124 +0.980392 0.676827 0.984283 0.887610 +0.984314 0.681436 0.987431 0.890094 +0.988235 0.686058 0.990577 0.892575 +0.992157 0.690692 0.993721 0.895053 +0.996078 0.695340 0.996862 0.897528 +1.000000 0.700000 1.000000 0.900000 +END_DATA diff --git a/usb/ArgyllCMS.cat b/usb/ArgyllCMS.cat Binary files differindex 6d0305e..91c5a81 100644 --- a/usb/ArgyllCMS.cat +++ b/usb/ArgyllCMS.cat diff --git a/usb/ArgyllCMS_x64.cat b/usb/ArgyllCMS_x64.cat Binary files differindex e1f12c6..24b915e 100644 --- a/usb/ArgyllCMS_x64.cat +++ b/usb/ArgyllCMS_x64.cat diff --git a/xicc/xlut.c b/xicc/xlut.c index 8b7699c..827dde8 100644 --- a/xicc/xlut.c +++ b/xicc/xlut.c @@ -46,6 +46,10 @@ Should xlutfix.c be revived (also adding ICM_CLUT_SET_APXLS support), to improve "bumpy black" problem ? + + Would be nice to be able to specify a specific patch + as the white one rather than using heuristic to identify it, + since some pathalogical cases don't work. */ /* diff --git a/xicc/xmatrix.c b/xicc/xmatrix.c index 034a396..3d4fca6 100644 --- a/xicc/xmatrix.c +++ b/xicc/xmatrix.c @@ -32,6 +32,9 @@ * normalized back to zero by scaling the matrix before storing * the result in the ICC profile. * + * Would be nice to be able to specify a specific patch + * as the white one rather than using heuristic to identify it, + * since some pathalogical cases don't work. */ diff --git a/xicc/xspect.c b/xicc/xspect.c index 1df8555..6738113 100644 --- a/xicc/xspect.c +++ b/xicc/xspect.c @@ -3197,7 +3197,7 @@ static xspect CIE1995_TCS[] = { 0.44, 0.44, 0.45, 0.45, 0.45 } }, - /* TCS15 1 YR 6/4 Asian skin */ + /* TCS15 1 YR 6/4 Asian skin - JIS standard */ { 95, 360.0, 830.0, /* 95 bands from 360 to 830 nm in 5nm steps */ 1.0, /* Scale factor */ @@ -52,7 +52,8 @@ do cd _zipdir zip -9 -m ../argyll.zip `cat ../_ziplist` cd .. - if ! expr ${i} : '\b\.\b' > /dev/null ; then + #if ! expr ${i} : '\b\.\b' > /dev/null ; then + if ! expr ${i} : '\.' > /dev/null ; then rm -r _zipdir/${i} fi fi @@ -87,7 +88,8 @@ do cd _zipdir zip -9 -m ../argyll.zip `cat ../_ziplist` cd .. - if ! expr ${i} : '\b\.\b' > /dev/null ; then + #if ! expr ${i} : '\b\.\b' > /dev/null ; then + if ! expr ${i} : '\.' > /dev/null ; then rm -r _zipdir/${i} fi fi |