New upstream release

6 files changed, 152 insertions, 53 deletions

diff --git a/ref/ColorCheckerPassport.cht b/ref/ColorCheckerPassport.cht
index 758cad7..5378c2f 100644
--- a/ref/ColorCheckerPassport.cht
+++ b/ref/ColorCheckerPassport.cht
@@ -69,54 +69,54 @@ YLIST 38
   105.7 1.0 1.0
   112.4 1.0 1.0
 
-EXPECTED XYZ
-SAT1    31.444334   19.286094    6.888559
-SAT2    56.064662   44.030373    6.427599
-SAT3    67.324242   67.447159    7.468562
-SAT4    15.570651   29.465796   11.20434
-SAT5    21.619963   29.778971   41.25516
-SAT6    17.456572   19.372800   46.61877
-SAT7    24.114288   18.910816   30.96444
-SAT8    30.360635   18.858573   16.93814
-WBP1    55.603171   57.729295   46.42132
-WBP2    57.049606   60.324512   49.89966
-WBP3    53.811668   58.177050   49.42470
-WBP4    52.378305   57.343255   49.64556
-WBP5    52.469763   58.680177   51.97625
-WBL1    59.661034   59.332741   48.55177
-WBL2    59.041480   59.368909   48.29234
-WBL3    55.920447   58.052670   47.03935
-WBL4    55.083575   58.526581   51.10275
-WBL5    53.892264   58.200472   53.59833
-NEU1     3.151107    3.263644    2.737095
-NEU2     3.610326    3.768524    3.225077
-NEU3     4.585675    4.814770    4.063276
-NEU4     5.242110    5.523981    4.582603
-NEU5    44.365128   46.364955   37.75652
-NEU6    55.836099   58.281967   47.53593
-NEU7    70.627230   73.603361   59.69403
-NEU8    88.638466   92.368156   71.51666
-A1      11.411919   10.072672    5.112897
-A2      38.118655   34.074205   18.53409
-A3      16.687521   18.224488   25.41503
-A4      11.119565   13.272712    5.165291
-A5      23.995041   23.022599   32.25695
-A6      29.864887   41.242607   33.61720
-B1      40.774497   30.980646    4.853984
-B2      12.786912   11.654674   29.31582
-B3      29.900282   19.631992   10.31426
-B4       8.854344    6.750602   10.88177
-B5      35.445183   44.094908    8.863355
-B6      49.113465   43.647237    6.214123
-C1       6.659992    5.799339   20.11315
-C2      15.407588   23.700772    7.772715
-C3      21.254733   12.710445    3.970060
-C4      58.616280   59.203678    6.871706
-C5      31.444170   20.458848   23.34756
-C6      13.290512   19.046913   29.20373
-D1      87.016740   90.636247   69.99650
-D2      57.632418   59.860806   48.52846
-D3      35.434916   36.927843   30.23039
-D4      18.558911   19.319142   15.73822
-D5       8.770657    9.165214    7.636996
-D6       3.216922    3.320339    2.732945
+EXPECTED XYZ 50
+  SAT1    31.444334   19.286094    6.888559
+  SAT2    56.064662   44.030373    6.427599
+  SAT3    67.324242   67.447159    7.468562
+  SAT4    15.570651   29.465796   11.20434
+  SAT5    21.619963   29.778971   41.25516
+  SAT6    17.456572   19.372800   46.61877
+  SAT7    24.114288   18.910816   30.96444
+  SAT8    30.360635   18.858573   16.93814
+  WBP1    55.603171   57.729295   46.42132
+  WBP2    57.049606   60.324512   49.89966
+  WBP3    53.811668   58.177050   49.42470
+  WBP4    52.378305   57.343255   49.64556
+  WBP5    52.469763   58.680177   51.97625
+  WBL1    59.661034   59.332741   48.55177
+  WBL2    59.041480   59.368909   48.29234
+  WBL3    55.920447   58.052670   47.03935
+  WBL4    55.083575   58.526581   51.10275
+  WBL5    53.892264   58.200472   53.59833
+  NEU1     3.151107    3.263644    2.737095
+  NEU2     3.610326    3.768524    3.225077
+  NEU3     4.585675    4.814770    4.063276
+  NEU4     5.242110    5.523981    4.582603
+  NEU5    44.365128   46.364955   37.75652
+  NEU6    55.836099   58.281967   47.53593
+  NEU7    70.627230   73.603361   59.69403
+  NEU8    88.638466   92.368156   71.51666
+  A1      11.411919   10.072672    5.112897
+  A2      38.118655   34.074205   18.53409
+  A3      16.687521   18.224488   25.41503
+  A4      11.119565   13.272712    5.165291
+  A5      23.995041   23.022599   32.25695
+  A6      29.864887   41.242607   33.61720
+  B1      40.774497   30.980646    4.853984
+  B2      12.786912   11.654674   29.31582
+  B3      29.900282   19.631992   10.31426
+  B4       8.854344    6.750602   10.88177
+  B5      35.445183   44.094908    8.863355
+  B6      49.113465   43.647237    6.214123
+  C1       6.659992    5.799339   20.11315
+  C2      15.407588   23.700772    7.772715
+  C3      21.254733   12.710445    3.970060
+  C4      58.616280   59.203678    6.871706
+  C5      31.444170   20.458848   23.34756
+  C6      13.290512   19.046913   29.20373
+  D1      87.016740   90.636247   69.99650
+  D2      57.632418   59.860806   48.52846
+  D3      35.434916   36.927843   30.23039
+  D4      18.558911   19.319142   15.73822
+  D5       8.770657    9.165214    7.636996
+  D6       3.216922    3.320339    2.732945
diff --git a/ref/SpyderChecker24.cht b/ref/SpyderChecker24.cht
new file mode 100644
index 0000000..a67bbf6
--- /dev/null
+++ b/ref/SpyderChecker24.cht
@@ -0,0 +1,59 @@
+BOXES 25
+  F _ _ 11 11 405.5  11   405.5  609.5  11 609.5
+  D ALL ALL _ _ 415 619   0 0 0 0
+  X  A D 1 6  88.5 88.5    11  11  102  102
+ 
+
+BOX_SHRINK 8.0
+
+REF_ROTATION 0.0
+
+XLIST 8
+  11.0 1.0 1.0
+  99.5 1.0 1.0
+  113.0 1.0 1.0
+  201.5 1.0 1.0
+  215.0 1.0 1.0
+  303.5 1.0 1.0
+  317.0 1.0 1.0
+  405.5 1.0 1.0
+
+YLIST 12
+  11.0 1.0 1.0
+  99.5 1.0 1.0
+  113.0 1.0 1.0
+  201.5 1.0 1.0
+  215.0 1.0 1.0
+  303.5 1.0 1.0
+  317.0 1.0 1.0
+  405.5 1.0 1.0
+  419.0 1.0 1.0
+  507.5 1.0 1.0
+  521.0 1.0 1.0
+  609.5 1.0 1.0
+  
+EXPECTED XYZ 24 
+  A1	85.00	89.31	96.33
+  A2	54.09	56.94	61.35
+  A3	32.55	34.33	36.79
+  A4	17.72	18.68	20.09
+  A5	7.89	8.30	8.87
+  A6	2.65	2.78	3.12
+  B1	12.84	18.14	36.39
+  B2	28.20	18.34	29.84
+  B3	57.08	61.01	8.56
+  B4	19.63	11.29	4.87
+  B5	13.70	22.39	9.24
+  B6	7.32	5.35	26.41
+  C1	35.76	28.16	5.45
+  C2	12.71	11.07	36.60
+  C3	27.74	18.51	13.48
+  C4	9.34	6.93	16.38
+  C5	33.22	43.77	10.98
+  C6	46.49	42.42	7.53
+  D1	30.35	42.13	42.95
+  D2	24.45	23.05	44.34
+  D3	9.73	12.51	6.59
+  D4	17.28	18.47	34.69
+  D5	36.71	34.18	24.66
+  D6	10.43	9.32	6.27
diff --git a/ref/SpyderChecker24.cie b/ref/SpyderChecker24.cie
new file mode 100644
index 0000000..49bdf61
--- /dev/null
+++ b/ref/SpyderChecker24.cie
@@ -0,0 +1,38 @@
+IT8.7/2
+ORIGINATOR "Jose Pereira"
+DESCRIPTOR "Datacolor SpyderCheckr (D65)"
+CREATED  "dec, 19. 2011"
+MANUFACTURER "DataColor"
+
+NUMBER_OF_FIELDS 7
+BEGIN_DATA_FORMAT
+SAMPLE_ID XYZ_X XYZ_Y XYZ_Z
+END_DATA_FORMAT
+
+NUMBER_OF_SETS 24
+BEGIN_DATA
+A1	85.00	89.31	96.33	
+A2	54.09	56.94	61.35	
+A3	32.55	34.33	36.79	
+A4	17.72	18.68	20.09	
+A5	7.89	8.30	8.87	
+A6	2.65	2.78	3.12	
+B1	12.84	18.14	36.39	
+B2	28.20	18.34	29.84	
+B3	57.08	61.01	8.56	
+B4	19.63	11.29	4.87	
+B5	13.70	22.39	9.24	
+B6	7.32	5.35	26.41	
+C1	35.76	28.16	5.45	
+C2	12.71	11.07	36.60	
+C3	27.74	18.51	13.48	
+C4	9.34	6.93	16.38	
+C5	33.22	43.77	10.98	
+C6	46.49	42.42	7.53	
+D1	30.35	42.13	42.95	
+D2	24.45	23.05	44.34	
+D3	9.73	12.51	6.59	
+D4	17.28	18.47	34.69	
+D5	36.71	34.18	24.66	
+D6	10.43	9.32	6.27	
+END_DATA
diff --git a/ref/afiles b/ref/afiles
index 360448a..bd8a2f1 100644
--- a/ref/afiles
+++ b/ref/afiles
@@ -28,6 +28,8 @@ ColorCheckerPassport.cht
 ColorCheckerPassport.cie
 SpyderChecker.cht
 SpyderChecker.cie
+SpyderChecker24.cht
+SpyderChecker24.cie
 ECI2002.ti2
 ECI2002R.ti2
 FograStrip2.ti1
diff --git a/ref/linear.cal b/ref/linear.cal
index b686edc..9c88605 100644
--- a/ref/linear.cal
+++ b/ref/linear.cal
@@ -2,7 +2,7 @@ CAL
 
 DESCRIPTOR "Argyll Device Calibration Curves"
 ORIGINATOR "Argyll synthcal"
-CREATED "Thu Jun 04 09:27:53 2015"
+CREATED "Mon Oct 26 01:10:48 2015"
 DEVICE_CLASS "DISPLAY"
 COLOR_REP "RGB"
 
diff --git a/ref/strange.cal b/ref/strange.cal
index 6757f3b..5f2e94d 100644
--- a/ref/strange.cal
+++ b/ref/strange.cal
@@ -2,7 +2,7 @@ CAL
 
 DESCRIPTOR "Argyll Device Calibration Curves"
 ORIGINATOR "Argyll synthcal"
-CREATED "Thu Jun 04 09:27:53 2015"
+CREATED "Mon Oct 26 01:10:48 2015"
 DEVICE_CLASS "DISPLAY"
 COLOR_REP "RGB"