summaryrefslogtreecommitdiff
path: root/scanin
diff options
context:
space:
mode:
Diffstat (limited to 'scanin')
-rwxr-xr-x[-rw-r--r--]scanin/CMP_DT_003.cht0
-rwxr-xr-x[-rw-r--r--]scanin/CMP_Digital_Target-4.cht0
-rwxr-xr-x[-rw-r--r--]scanin/CMP_Digital_Target-4.cie0
-rwxr-xr-x[-rw-r--r--]scanin/CMP_Digital_Target-4.ti20
-rwxr-xr-x[-rw-r--r--]scanin/CMP_Digital_Target-7.cht0
-rwxr-xr-x[-rw-r--r--]scanin/ColorChecker.cht0
-rwxr-xr-x[-rw-r--r--]scanin/ColorChecker.cie0
-rwxr-xr-x[-rw-r--r--]scanin/ColorCheckerDC.cht0
-rwxr-xr-x[-rw-r--r--]scanin/ColorCheckerDC.ti20
-rwxr-xr-xscanin/ColorCheckerHalfPassport.cht58
-rwxr-xr-xscanin/ColorCheckerHalfPassport.cie38
-rwxr-xr-x[-rw-r--r--]scanin/ColorCheckerPassport.cht0
-rwxr-xr-x[-rw-r--r--]scanin/ColorCheckerPassport.cie0
-rwxr-xr-x[-rw-r--r--]scanin/ColorCheckerSG.cht0
-rwxr-xr-x[-rw-r--r--]scanin/ColorCheckerSG.ti20
-rwxr-xr-x[-rw-r--r--]scanin/Hutchcolor.cht0
-rwxr-xr-x[-rw-r--r--]scanin/Jamfile2
-rwxr-xr-x[-rw-r--r--]scanin/LaserSoftDCPro.cht0
-rwxr-xr-x[-rw-r--r--]scanin/License.txt0
-rwxr-xr-x[-rw-r--r--]scanin/QPcard_201.cht0
-rwxr-xr-x[-rw-r--r--]scanin/QPcard_201.cie0
-rwxr-xr-x[-rw-r--r--]scanin/QPcard_202.cht0
-rwxr-xr-x[-rw-r--r--]scanin/QPcard_202.cie0
-rwxr-xr-x[-rw-r--r--]scanin/Readme.txt0
-rwxr-xr-x[-rw-r--r--]scanin/SpyderChecker.cht0
-rwxr-xr-x[-rw-r--r--]scanin/SpyderChecker.cie0
-rwxr-xr-x[-rw-r--r--]scanin/SpyderChecker24.cht0
-rwxr-xr-x[-rw-r--r--]scanin/SpyderChecker24.cie0
-rwxr-xr-x[-rw-r--r--]scanin/afiles2
-rwxr-xr-x[-rw-r--r--]scanin/i1_RGB_Scan_1.4.cht0
-rwxr-xr-x[-rw-r--r--]scanin/it8.cht0
-rwxr-xr-x[-rw-r--r--]scanin/scanin.c0
-rwxr-xr-x[-rw-r--r--]scanin/scanrd.c2
-rwxr-xr-x[-rw-r--r--]scanin/scanrd.h0
-rwxr-xr-x[-rw-r--r--]scanin/scanrd_.h0
35 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 8cc38ea..8cc38ea 100644..100755
--- a/scanin/CMP_Digital_Target-4.ti2
+++ b/scanin/CMP_Digital_Target-4.ti2
diff --git a/scanin/CMP_Digital_Target-7.cht b/scanin/CMP_Digital_Target-7.cht
index d188517..d188517 100644..100755
--- a/scanin/CMP_Digital_Target-7.cht
+++ b/scanin/CMP_Digital_Target-7.cht
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/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 <ben@trumpetpower.com>"
+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
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 239b9e6..239b9e6 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 203ba2a..c62a1c2 100644..100755
--- 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
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
index a67bbf6..a67bbf6 100644..100755
--- a/scanin/SpyderChecker24.cht
+++ b/scanin/SpyderChecker24.cht
diff --git a/scanin/SpyderChecker24.cie b/scanin/SpyderChecker24.cie
index 49bdf61..49bdf61 100644..100755
--- a/scanin/SpyderChecker24.cie
+++ b/scanin/SpyderChecker24.cie
diff --git a/scanin/afiles b/scanin/afiles
index cd76a75..64f2259 100644..100755
--- 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
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..8e30a76 100644..100755
--- 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
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
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-10 18:02:13 +0000