diff options
author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2015-08-23 12:22:51 +0200 |
---|---|---|
committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2015-08-23 12:22:51 +0200 |
commit | bc3604d9b226ac475a104cd8ae2ca2d1d4a27984 (patch) | |
tree | e796661f371a94a50edfdc693388bb911b253dfd /scanin | |
parent | 509016be676f7915d635fa57144d2a441e3090ca (diff) | |
parent | c0b89ac5bfb90835ef01573267020e42d4fe070c (diff) |
Merge new upstream release
Diffstat (limited to 'scanin')
-rwxr-xr-x[-rw-r--r--] | scanin/CMP_DT_003.cht | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | scanin/CMP_Digital_Target-4.cht | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | scanin/CMP_Digital_Target-4.cie | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | scanin/CMP_Digital_Target-4.ti2 | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | scanin/ColorChecker.cht | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | scanin/ColorChecker.cie | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | scanin/ColorCheckerDC.cht | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | scanin/ColorCheckerDC.ti2 | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | scanin/ColorCheckerPassport.cht | 102 | ||||
-rwxr-xr-x[-rw-r--r--] | scanin/ColorCheckerPassport.cie | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | scanin/ColorCheckerSG.cht | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | scanin/ColorCheckerSG.ti2 | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | scanin/Hutchcolor.cht | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | scanin/Jamfile | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | scanin/LaserSoftDCPro.cht | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | scanin/License.txt | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | scanin/QPcard_201.cht | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | scanin/QPcard_201.cie | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | scanin/QPcard_202.cht | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | scanin/QPcard_202.cie | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | scanin/Readme.txt | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | scanin/SpyderChecker.cht | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | scanin/SpyderChecker.cie | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | scanin/afiles | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | scanin/i1_RGB_Scan_1.4.cht | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | scanin/it8.cht | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | scanin/scanin.c | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | scanin/scanrd.c | 2 | ||||
-rwxr-xr-x[-rw-r--r--] | scanin/scanrd.h | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | scanin/scanrd_.h | 0 |
30 files changed, 52 insertions, 52 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 758cad7..5378c2f 100644..100755 --- a/scanin/ColorCheckerPassport.cht +++ b/scanin/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/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..7a1ab7a 100644..100755 --- a/scanin/Jamfile +++ b/scanin/Jamfile 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/afiles b/scanin/afiles index 399961c..399961c 100644..100755 --- a/scanin/afiles +++ b/scanin/afiles 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 a915e44..7e497be 100644..100755 --- a/scanin/scanrd.c +++ b/scanin/scanrd.c @@ -28,7 +28,7 @@ #undef DIAGN /* Allow diagonal connectivity of groups */ #define AA_LINES /* Plot diagnostics using anti-aliased lines */ -#define MATCHCC 0.3 /* Match correlation threshold - reject any match under this */ +#define MATCHCC 0.25 /* Match correlation threshold - reject any match under this */ /* (Might want to be able to override this in command line) */ #define ALT_ROT_TH 0.7 /* Correlation threshold of alternate rotations to be greater than this */ 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 |