From f6b8e0eae4374f339487a33e3e4fe5462d5816e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sat, 25 Nov 2017 10:16:00 +0100 Subject: New upstream version 2.0.0 --- scanin/CMP_DT_003.cht | 0 scanin/CMP_Digital_Target-4.cht | 0 scanin/CMP_Digital_Target-4.cie | 0 scanin/CMP_Digital_Target-4.ti2 | 0 scanin/CMP_Digital_Target-7.cht | 0 scanin/ColorChecker.cht | 0 scanin/ColorChecker.cie | 0 scanin/ColorCheckerDC.cht | 0 scanin/ColorCheckerDC.ti2 | 0 scanin/ColorCheckerHalfPassport.cht | 58 +++++++++++++++++++++++++++++++++++++ scanin/ColorCheckerHalfPassport.cie | 38 ++++++++++++++++++++++++ scanin/ColorCheckerPassport.cht | 0 scanin/ColorCheckerPassport.cie | 0 scanin/ColorCheckerSG.cht | 0 scanin/ColorCheckerSG.ti2 | 0 scanin/Hutchcolor.cht | 0 scanin/Jamfile | 2 ++ scanin/LaserSoftDCPro.cht | 0 scanin/License.txt | 0 scanin/QPcard_201.cht | 0 scanin/QPcard_201.cie | 0 scanin/QPcard_202.cht | 0 scanin/QPcard_202.cie | 0 scanin/Readme.txt | 0 scanin/SpyderChecker.cht | 0 scanin/SpyderChecker.cie | 0 scanin/SpyderChecker24.cht | 0 scanin/SpyderChecker24.cie | 0 scanin/afiles | 2 ++ scanin/i1_RGB_Scan_1.4.cht | 0 scanin/it8.cht | 0 scanin/scanin.c | 0 scanin/scanrd.c | 2 +- scanin/scanrd.h | 0 scanin/scanrd_.h | 0 35 files changed, 101 insertions(+), 1 deletion(-) mode change 100644 => 100755 scanin/CMP_DT_003.cht mode change 100644 => 100755 scanin/CMP_Digital_Target-4.cht mode change 100644 => 100755 scanin/CMP_Digital_Target-4.cie mode change 100644 => 100755 scanin/CMP_Digital_Target-4.ti2 mode change 100644 => 100755 scanin/CMP_Digital_Target-7.cht mode change 100644 => 100755 scanin/ColorChecker.cht mode change 100644 => 100755 scanin/ColorChecker.cie mode change 100644 => 100755 scanin/ColorCheckerDC.cht mode change 100644 => 100755 scanin/ColorCheckerDC.ti2 create mode 100755 scanin/ColorCheckerHalfPassport.cht create mode 100755 scanin/ColorCheckerHalfPassport.cie mode change 100644 => 100755 scanin/ColorCheckerPassport.cht mode change 100644 => 100755 scanin/ColorCheckerPassport.cie mode change 100644 => 100755 scanin/ColorCheckerSG.cht mode change 100644 => 100755 scanin/ColorCheckerSG.ti2 mode change 100644 => 100755 scanin/Hutchcolor.cht mode change 100644 => 100755 scanin/Jamfile mode change 100644 => 100755 scanin/LaserSoftDCPro.cht mode change 100644 => 100755 scanin/License.txt mode change 100644 => 100755 scanin/QPcard_201.cht mode change 100644 => 100755 scanin/QPcard_201.cie mode change 100644 => 100755 scanin/QPcard_202.cht mode change 100644 => 100755 scanin/QPcard_202.cie mode change 100644 => 100755 scanin/Readme.txt mode change 100644 => 100755 scanin/SpyderChecker.cht mode change 100644 => 100755 scanin/SpyderChecker.cie mode change 100644 => 100755 scanin/SpyderChecker24.cht mode change 100644 => 100755 scanin/SpyderChecker24.cie mode change 100644 => 100755 scanin/afiles mode change 100644 => 100755 scanin/i1_RGB_Scan_1.4.cht mode change 100644 => 100755 scanin/it8.cht mode change 100644 => 100755 scanin/scanin.c mode change 100644 => 100755 scanin/scanrd.c mode change 100644 => 100755 scanin/scanrd.h mode change 100644 => 100755 scanin/scanrd_.h (limited to 'scanin') diff --git a/scanin/CMP_DT_003.cht b/scanin/CMP_DT_003.cht old mode 100644 new mode 100755 diff --git a/scanin/CMP_Digital_Target-4.cht b/scanin/CMP_Digital_Target-4.cht old mode 100644 new mode 100755 diff --git a/scanin/CMP_Digital_Target-4.cie b/scanin/CMP_Digital_Target-4.cie old mode 100644 new mode 100755 diff --git a/scanin/CMP_Digital_Target-4.ti2 b/scanin/CMP_Digital_Target-4.ti2 old mode 100644 new mode 100755 diff --git a/scanin/CMP_Digital_Target-7.cht b/scanin/CMP_Digital_Target-7.cht old mode 100644 new mode 100755 diff --git a/scanin/ColorChecker.cht b/scanin/ColorChecker.cht old mode 100644 new mode 100755 diff --git a/scanin/ColorChecker.cie b/scanin/ColorChecker.cie old mode 100644 new mode 100755 diff --git a/scanin/ColorCheckerDC.cht b/scanin/ColorCheckerDC.cht old mode 100644 new mode 100755 diff --git a/scanin/ColorCheckerDC.ti2 b/scanin/ColorCheckerDC.ti2 old mode 100644 new mode 100755 diff --git a/scanin/ColorCheckerHalfPassport.cht b/scanin/ColorCheckerHalfPassport.cht new file mode 100755 index 0000000..8185e59 --- /dev/null +++ b/scanin/ColorCheckerHalfPassport.cht @@ -0,0 +1,58 @@ +BOXES 25 + F _ _ 97.0 17.0 157.3 17.0 157.3 107.0 97.0 107.0 + D ALL ALL _ _ 59.0 5.0 98.0 11.0 0.0 0.0 + X A D 1 6 12.4 12.4 98.5 93.4 15.0 -15.0 + +BOX_SHRINK 2.0 + +REF_ROTATION 0.0 + +XLIST 8 + 98.5 1.0 1.0 + 110.9 1.0 1.0 + 113.5 1.0 1.0 + 125.9 1.0 1.0 + 128.5 1.0 1.0 + 140.9 1.0 1.0 + 143.5 1.0 1.0 + 155.9 1.0 1.0 + +YLIST 12 + 18.5 1.0 1.0 + 30.9 1.0 1.0 + 33.5 1.0 1.0 + 45.8 1.0 1.0 + 48.4 1.0 1.0 + 60.7 1.0 1.0 + 63.4 1.0 1.0 + 75.7 1.0 1.0 + 78.4 1.0 1.0 + 93.4 1.0 1.0 + 99.4 1.0 1.0 + 105.7 1.0 1.0 + +EXPECTED XYZ 24 + 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/ColorCheckerHalfPassport.cie b/scanin/ColorCheckerHalfPassport.cie new file mode 100755 index 0000000..681d808 --- /dev/null +++ b/scanin/ColorCheckerHalfPassport.cie @@ -0,0 +1,38 @@ +CTI3 +DESCRIPTOR "ColorChecker Half Passport CIE data" +ORIGINATOR "Ben Goren " +CREATED "Fri Aug 3 15:35:05 MST 2012" + +KEYWORD "SAMPLE_LOC" +NUMBER_OF_FIELDS 7 +BEGIN_DATA_FORMAT +SAMPLE_LOC XYZ_X XYZ_Y XYZ_Z LAB_L LAB_A LAB_B +END_DATA_FORMAT + +NUMBER_OF_SETS 24 +BEGIN_DATA +A1 11.411919 10.072672 5.112897 37.972545 12.849750 13.905933 +A2 38.118655 34.074205 18.534096 65.021429 17.736538 18.105244 +A3 16.687521 18.224488 25.415039 49.767263 -4.838656 -21.688821 +A4 11.119565 13.272712 5.165291 43.171313 -11.673243 22.599880 +A5 23.995041 23.022599 32.256955 55.095608 8.054000 -23.674108 +A6 29.864887 41.242607 33.617201 70.345563 -33.879730 0.591375 +B1 40.774497 30.980646 4.853984 62.491292 36.974257 57.538878 +B2 12.786912 11.654674 29.315826 40.661930 10.745627 -43.972357 +B3 29.900282 19.631992 10.314269 51.418556 47.835790 16.229131 +B4 8.854344 6.750602 10.881778 31.232269 21.992198 -20.376399 +B5 35.445183 44.094908 8.863355 72.291888 -22.389553 57.145982 +B6 49.113465 43.647237 6.214123 71.992078 20.037754 67.243006 +C1 6.659992 5.799339 20.113152 28.900464 11.613838 -47.531575 +C2 15.407588 23.700772 7.772715 55.786947 -38.099805 32.761011 +C3 21.254733 12.710445 3.970060 42.323678 50.646029 27.808803 +C4 58.616280 59.203678 6.871706 81.403423 3.722966 80.589317 +C5 31.444170 20.458848 23.347563 52.352077 49.539466 -13.465303 +C6 13.290512 19.046913 29.203736 50.742046 -29.398805 -26.412062 +D1 87.016740 90.636247 69.996509 96.260066 -0.692605 4.206323 +D2 57.632418 59.860806 48.528468 81.762472 -0.207864 0.973581 +D3 35.434916 36.927843 30.230398 67.222860 -0.574879 0.364223 +D4 18.558911 19.319142 15.738222 51.058515 -0.355289 0.481164 +D5 8.770657 9.165214 7.636996 36.300462 -0.566396 -0.303560 +D6 3.216922 3.320339 2.732945 21.283684 0.258119 0.046995 +END_DATA diff --git a/scanin/ColorCheckerPassport.cht b/scanin/ColorCheckerPassport.cht old mode 100644 new mode 100755 diff --git a/scanin/ColorCheckerPassport.cie b/scanin/ColorCheckerPassport.cie old mode 100644 new mode 100755 diff --git a/scanin/ColorCheckerSG.cht b/scanin/ColorCheckerSG.cht old mode 100644 new mode 100755 diff --git a/scanin/ColorCheckerSG.ti2 b/scanin/ColorCheckerSG.ti2 old mode 100644 new mode 100755 diff --git a/scanin/Hutchcolor.cht b/scanin/Hutchcolor.cht old mode 100644 new mode 100755 diff --git a/scanin/Jamfile b/scanin/Jamfile old mode 100644 new mode 100755 index 203ba2a..c62a1c2 --- a/scanin/Jamfile +++ b/scanin/Jamfile @@ -26,6 +26,8 @@ InstallFile $(DESTDIR)$(PREFIX)/$(REFSUBDIR) : $(Samples) ; # Chart recognition library Library libscanrd : scanrd.c : : : ../numlib ; +LINKFLAGS += $(GUILINKFLAGS) ; + # IT8 chart reader - sucks in tiff file and spits out cgats file Main scanin : scanin.c ; # ObjectHdrs scanin : ../h ../cgats ../numlib ../icc ../rspl ../gamut ../xicc $(TIFFINC) ; diff --git a/scanin/LaserSoftDCPro.cht b/scanin/LaserSoftDCPro.cht old mode 100644 new mode 100755 diff --git a/scanin/License.txt b/scanin/License.txt old mode 100644 new mode 100755 diff --git a/scanin/QPcard_201.cht b/scanin/QPcard_201.cht old mode 100644 new mode 100755 diff --git a/scanin/QPcard_201.cie b/scanin/QPcard_201.cie old mode 100644 new mode 100755 diff --git a/scanin/QPcard_202.cht b/scanin/QPcard_202.cht old mode 100644 new mode 100755 diff --git a/scanin/QPcard_202.cie b/scanin/QPcard_202.cie old mode 100644 new mode 100755 diff --git a/scanin/Readme.txt b/scanin/Readme.txt old mode 100644 new mode 100755 diff --git a/scanin/SpyderChecker.cht b/scanin/SpyderChecker.cht old mode 100644 new mode 100755 diff --git a/scanin/SpyderChecker.cie b/scanin/SpyderChecker.cie old mode 100644 new mode 100755 diff --git a/scanin/SpyderChecker24.cht b/scanin/SpyderChecker24.cht old mode 100644 new mode 100755 diff --git a/scanin/SpyderChecker24.cie b/scanin/SpyderChecker24.cie old mode 100644 new mode 100755 diff --git a/scanin/afiles b/scanin/afiles old mode 100644 new mode 100755 index cd76a75..64f2259 --- a/scanin/afiles +++ b/scanin/afiles @@ -17,6 +17,8 @@ Hutchcolor.cht i1_RGB_Scan_1.4.cht ColorCheckerPassport.cht ColorCheckerPassport.cie +ColorCheckerHalfPassport.cht +ColorCheckerHalfPassport.cie QPcard_201.cht QPcard_201.cie QPcard_202.cht diff --git a/scanin/i1_RGB_Scan_1.4.cht b/scanin/i1_RGB_Scan_1.4.cht old mode 100644 new mode 100755 diff --git a/scanin/it8.cht b/scanin/it8.cht old mode 100644 new mode 100755 diff --git a/scanin/scanin.c b/scanin/scanin.c old mode 100644 new mode 100755 diff --git a/scanin/scanrd.c b/scanin/scanrd.c old mode 100644 new mode 100755 index 7e497be..8e30a76 --- a/scanin/scanrd.c +++ b/scanin/scanrd.c @@ -3471,7 +3471,7 @@ scanrd_ *s ADD_ITEM_TO_TOP(s->alist,sp); /* Add it to the active list */ sp->active = 1; sp->ps[0] = calloc(s->tdepth * binsize,sizeof(unsigned long)); - if (sp->ps == NULL) + if (sp->ps[0] == NULL) error("do_value_scan: Failed to malloc sbox histogram array"); for (e = 1; e < s->depth; e++) sp->ps[e] = sp->ps[e-1] + binsize; diff --git a/scanin/scanrd.h b/scanin/scanrd.h old mode 100644 new mode 100755 diff --git a/scanin/scanrd_.h b/scanin/scanrd_.h old mode 100644 new mode 100755 -- cgit v1.2.3