Imported Upstream version 1.8.3

32 files changed, 101 insertions, 1 deletions

diff --git a/scanin/CMP_DT_003.cht b/scanin/CMP_DT_003.cht
index 37411af..37411af 100644..100755
--- a/scanin/CMP_DT_003.cht
+++ b/scanin/CMP_DT_003.cht
diff --git a/scanin/CMP_Digital_Target-4.cht b/scanin/CMP_Digital_Target-4.cht
index eb95ed8..eb95ed8 100644..100755
--- a/scanin/CMP_Digital_Target-4.cht
+++ b/scanin/CMP_Digital_Target-4.cht
diff --git a/scanin/CMP_Digital_Target-4.cie b/scanin/CMP_Digital_Target-4.cie
index 6c8ff5d..6c8ff5d 100644..100755
--- a/scanin/CMP_Digital_Target-4.cie
+++ b/scanin/CMP_Digital_Target-4.cie
diff --git a/scanin/CMP_Digital_Target-4.ti2 b/scanin/CMP_Digital_Target-4.ti2
index e4b15e9..e4b15e9 100644..100755
--- a/scanin/CMP_Digital_Target-4.ti2
+++ b/scanin/CMP_Digital_Target-4.ti2
diff --git a/scanin/ColorChecker.cht b/scanin/ColorChecker.cht
index 1da441b..1da441b 100644..100755
--- a/scanin/ColorChecker.cht
+++ b/scanin/ColorChecker.cht
diff --git a/scanin/ColorChecker.cie b/scanin/ColorChecker.cie
index 8c78ff6..8c78ff6 100644..100755
--- a/scanin/ColorChecker.cie
+++ b/scanin/ColorChecker.cie
diff --git a/scanin/ColorCheckerDC.cht b/scanin/ColorCheckerDC.cht
index ad7ea29..ad7ea29 100644..100755
--- a/scanin/ColorCheckerDC.cht
+++ b/scanin/ColorCheckerDC.cht
diff --git a/scanin/ColorCheckerDC.ti2 b/scanin/ColorCheckerDC.ti2
index f87284c..f87284c 100644..100755
--- a/scanin/ColorCheckerDC.ti2
+++ b/scanin/ColorCheckerDC.ti2
diff --git a/scanin/ColorCheckerPassport.cht b/scanin/ColorCheckerPassport.cht
index 5378c2f..5378c2f 100644..100755
--- a/scanin/ColorCheckerPassport.cht
+++ b/scanin/ColorCheckerPassport.cht
diff --git a/scanin/ColorCheckerPassport.cie b/scanin/ColorCheckerPassport.cie
index f25c019..f25c019 100644..100755
--- a/scanin/ColorCheckerPassport.cie
+++ b/scanin/ColorCheckerPassport.cie
diff --git a/scanin/ColorCheckerSG.cht b/scanin/ColorCheckerSG.cht
index 1836f73..1836f73 100644..100755
--- a/scanin/ColorCheckerSG.cht
+++ b/scanin/ColorCheckerSG.cht
diff --git a/scanin/ColorCheckerSG.ti2 b/scanin/ColorCheckerSG.ti2
index 7459061..7459061 100644..100755
--- a/scanin/ColorCheckerSG.ti2
+++ b/scanin/ColorCheckerSG.ti2
diff --git a/scanin/Hutchcolor.cht b/scanin/Hutchcolor.cht
index fcc5135..fcc5135 100644..100755
--- a/scanin/Hutchcolor.cht
+++ b/scanin/Hutchcolor.cht
diff --git a/scanin/Jamfile b/scanin/Jamfile
index 7a1ab7a..2cb05fb 100644..100755
--- a/scanin/Jamfile
+++ b/scanin/Jamfile
@@ -13,7 +13,8 @@ Samples = it8.cht ColorChecker.cht ColorChecker.cie ColorCheckerDC.cht ColorChec
           ColorCheckerPassport.cht ColorCheckerPassport.cie
           QPcard_201.cht QPcard_201.cie QPcard_202.cht QPcard_202.cie CMP_DT_003.cht
           CMP_Digital_Target-4.cht CMP_Digital_Target-4.ti2 CMP_Digital_Target-4.cie
-          LaserSoftDCPro.cht SpyderChecker.cht SpyderChecker.cie ;
+          LaserSoftDCPro.cht SpyderChecker.cht SpyderChecker.cie
+          SpyderChecker24.cht SpyderChecker24.cie ;
 
 #Install
 InstallBin  $(DESTDIR)$(PREFIX)/bin : $(Executables) ;
diff --git a/scanin/LaserSoftDCPro.cht b/scanin/LaserSoftDCPro.cht
index e5df741..e5df741 100644..100755
--- a/scanin/LaserSoftDCPro.cht
+++ b/scanin/LaserSoftDCPro.cht
diff --git a/scanin/License.txt b/scanin/License.txt
index a871fcf..a871fcf 100644..100755
--- a/scanin/License.txt
+++ b/scanin/License.txt
diff --git a/scanin/QPcard_201.cht b/scanin/QPcard_201.cht
index a9d9542..a9d9542 100644..100755
--- a/scanin/QPcard_201.cht
+++ b/scanin/QPcard_201.cht
diff --git a/scanin/QPcard_201.cie b/scanin/QPcard_201.cie
index ecd1a3a..ecd1a3a 100644..100755
--- a/scanin/QPcard_201.cie
+++ b/scanin/QPcard_201.cie
diff --git a/scanin/QPcard_202.cht b/scanin/QPcard_202.cht
index 4d10406..4d10406 100644..100755
--- a/scanin/QPcard_202.cht
+++ b/scanin/QPcard_202.cht
diff --git a/scanin/QPcard_202.cie b/scanin/QPcard_202.cie
index 683b6c0..683b6c0 100644..100755
--- a/scanin/QPcard_202.cie
+++ b/scanin/QPcard_202.cie
diff --git a/scanin/Readme.txt b/scanin/Readme.txt
index 2976595..2976595 100644..100755
--- a/scanin/Readme.txt
+++ b/scanin/Readme.txt
diff --git a/scanin/SpyderChecker.cht b/scanin/SpyderChecker.cht
index 1c0ef3a..1c0ef3a 100644..100755
--- a/scanin/SpyderChecker.cht
+++ b/scanin/SpyderChecker.cht
diff --git a/scanin/SpyderChecker.cie b/scanin/SpyderChecker.cie
index 302e416..302e416 100644..100755
--- a/scanin/SpyderChecker.cie
+++ b/scanin/SpyderChecker.cie
diff --git a/scanin/SpyderChecker24.cht b/scanin/SpyderChecker24.cht
new file mode 100755
index 0000000..a67bbf6
--- /dev/null
+++ b/scanin/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/scanin/SpyderChecker24.cie b/scanin/SpyderChecker24.cie
new file mode 100755
index 0000000..49bdf61
--- /dev/null
+++ b/scanin/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/scanin/afiles b/scanin/afiles
index 399961c..90097e6 100644..100755
--- a/scanin/afiles
+++ b/scanin/afiles
@@ -28,3 +28,5 @@ CMP_Digital_Target-4.cie
 LaserSoftDCPro.cht
 SpyderChecker.cht
 SpyderChecker.cie
+SpyderChecker24.cht
+SpyderChecker24.cie
diff --git a/scanin/i1_RGB_Scan_1.4.cht b/scanin/i1_RGB_Scan_1.4.cht
index 3a3d7c9..3a3d7c9 100644..100755
--- a/scanin/i1_RGB_Scan_1.4.cht
+++ b/scanin/i1_RGB_Scan_1.4.cht
diff --git a/scanin/it8.cht b/scanin/it8.cht
index f1e256d..f1e256d 100644..100755
--- a/scanin/it8.cht
+++ b/scanin/it8.cht
diff --git a/scanin/scanin.c b/scanin/scanin.c
index 860d831..860d831 100644..100755
--- a/scanin/scanin.c
+++ b/scanin/scanin.c
diff --git a/scanin/scanrd.c b/scanin/scanrd.c
index 7e497be..7e497be 100644..100755
--- a/scanin/scanrd.c
+++ b/scanin/scanrd.c
diff --git a/scanin/scanrd.h b/scanin/scanrd.h
index 9507981..9507981 100644..100755
--- a/scanin/scanrd.h
+++ b/scanin/scanrd.h
diff --git a/scanin/scanrd_.h b/scanin/scanrd_.h
index 52d6368..52d6368 100644..100755
--- a/scanin/scanrd_.h
+++ b/scanin/scanrd_.h