From c07d0c2d2f6f7b0eb6e92cc6204bf05037957e82 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Mon, 1 Sep 2014 15:43:52 +0200 Subject: Imported Upstream version 1.6.3 --- scanin/ColorCheckerDC.ti2 | 264 ++++++++++++++++++++++++++++++++++++++++++++++ scanin/Jamfile | 2 +- scanin/afiles | 1 + scanin/scanin.c | 8 +- 4 files changed, 271 insertions(+), 4 deletions(-) create mode 100644 scanin/ColorCheckerDC.ti2 (limited to 'scanin') diff --git a/scanin/ColorCheckerDC.ti2 b/scanin/ColorCheckerDC.ti2 new file mode 100644 index 0000000..f87284c --- /dev/null +++ b/scanin/ColorCheckerDC.ti2 @@ -0,0 +1,264 @@ +CTI2 + +DESCRIPTOR "Argyll Calibration Target chart information 2" +ORIGINATOR "Argyll printtarg" +CREATED "Tue Nov 19 14:16:26 2013" +KEYWORD "TARGET_INSTRUMENT" +TARGET_INSTRUMENT "GretagMacbeth SpectroScan" +APPROX_WHITE_POINT "95.106486 100.000000 108.844025" +COLOR_REP "RGB" +CHART_ID 26 +STEPS_IN_PASS 12 +PASSES_IN_STRIPS2 20 +STRIP_INDEX_PATTERN "A-Z, A-Z" +PATCH_INDEX_PATTERN "@-9,0-9;01-99" +INDEX_ORDER "STRIP_THEN_PATCH" + +NUMBER_OF_FIELDS 8 +BEGIN_DATA_FORMAT +SAMPLE_ID SAMPLE_LOC RGB_R RGB_G RGB_B XYZ_X XYZ_Y XYZ_Z +END_DATA_FORMAT + +NUMBER_OF_SETS 240 +BEGIN_DATA +1 "A01" 95.27 94.34 100 74.79 77.56 64.46 +2 "A02" 10.1 12.72 15.23 3.08 3.19 2.77 +3 "A03" 50.01 49.47 53.83 18.98 19.71 16.53 +4 "A04" 95.19 94.25 100 74.57 77.34 64.38 +5 "A05" 10.25 12.82 15.3 3.1 3.21 2.78 +6 "A06" 49.76 49.32 53.63 18.88 19.62 16.44 +7 "A07" 95.23 94.31 100 74.65 77.43 64.37 +8 "A08" 9.95 12.59 14.99 3.05 3.16 2.74 +9 "A09" 49.73 49.25 53.58 18.86 19.59 16.42 +10 "A10" 95.1 94.22 99.98 74.33 77.13 64.18 +11 "A11" 9.95 12.59 14.99 3.05 3.16 2.74 +12 "A12" 49.93 49.4 53.72 18.94 19.67 16.48 +13 "B01" 50.01 49.47 53.83 18.98 19.71 16.53 +14 "B02" 46.36 12.46 22.34 9.28 6.32 3.27 +15 "B03" 32.74 22.03 19.37 7.34 6.63 3.64 +16 "B04" 56.14 48.21 40.46 19.71 19.69 11.13 +17 "B05" 35.71 36.78 28.68 10.69 11.58 6.54 +18 "B06" 19.44 26.18 17.23 5.55 6.26 3.53 +19 "B07" 9.63 29.83 19.36 4.69 6.4 3.88 +20 "B08" 5.03 29.78 29.99 4.45 6.24 5.6 +21 "B09" 11.74 26.06 33.69 5.26 6.13 6.71 +22 "B10" 7.48 17.09 38.75 4.16 4.4 7.55 +23 "B11" 31.81 19.87 28.2 7.13 6.18 5.2 +24 "B12" 95.28 94.35 100 74.68 77.45 64.31 +25 "C01" 9.86 12.49 14.83 3.03 3.14 2.72 +26 "C02" 78.87 8.12 37.96 22.27 12.45 5.91 +27 "C03" 50.95 30.12 24.15 13.73 11.57 5.26 +28 "C04" 44.44 34.21 17.16 12.35 11.83 4.46 +29 "C05" 46.22 52.19 26.89 16.62 19.15 7.75 +30 "C06" 23 40.19 25.32 8.81 11.49 5.72 +31 "C07" 9.34 43.53 27.72 7.38 11.51 5.94 +32 "C08" 9.06 40.65 41.35 7.96 11.09 9.57 +33 "C09" 8.24 25.27 43.76 5.61 6.35 9.68 +34 "C10" 4.46 23.9 51.18 5.49 6.22 12.37 +35 "C11" 39.09 18.2 33.1 8.5 6.58 6.19 +36 "C12" 9.9 12.54 14.91 3.04 3.15 2.73 +37 "D01" 95.25 94.34 100 74.7 77.48 64.38 +38 "D02" 83.18 3.28 29.2 23.6 12.43 3.41 +39 "D03" 58.04 28.35 19.08 15.71 12.25 4.16 +40 "D04" 60.64 50.58 1.68 19.85 19.78 4.3 +41 "D05" 44.66 55.44 3.99 15.7 19.2 4.89 +42 "D06" 50.68 71.99 20.2 22.07 30.17 8.05 +43 "D07" 1.82 46.45 32.24 6.22 11.44 6.34 +44 "D08" 2.68 60.96 59.88 11.56 19.31 16.65 +45 "D09" 6.74 22.7 51.61 5.69 6.13 12.53 +46 "D10" 5.74 20.48 57.17 5.6 5.88 14.72 +47 "D11" 43.58 14.07 38.16 9.13 6.35 7.28 +48 "D12" 49.85 49.34 53.67 18.91 19.64 16.46 +49 "E01" 49.93 49.45 53.76 18.95 19.69 16.5 +50 "E02" 98.18 12.49 38.48 35.41 20.25 6.45 +51 "E03" 83.15 34.43 11.22 28.25 20.38 3.83 +52 "E04" 62.85 47.43 3.48 20.73 19.59 4.47 +53 "E05" 49.17 54.51 0.58 16.4 19.03 4.34 +54 "E06" 67.94 82.3 53.02 34.81 43.02 17.75 +55 "E07" 7.82 61.12 45.54 11.78 19.58 11.32 +56 "E08" 0.06 48.5 61.14 6.88 11.75 14.39 +57 "E09" 0.19 40.75 67.67 7.88 11.31 19.64 +58 "E10" 3.32 36.11 77.29 9.22 11.09 27.08 +59 "E11" 65.18 18.84 54.73 17.84 11.47 13.98 +60 "E12" 95.25 94.3 100 74.56 77.32 64.24 +61 "F01" 9.9 12.54 14.91 3.04 3.15 2.73 +62 "F02" 99.74 26.47 46.59 48.3 30.25 11.41 +63 "F03" 62.95 20.45 23.38 16.14 10.93 3.9 +64 "F04" 76.63 60.56 22.07 31.33 29.91 8.52 +65 "F05" 36.63 55.19 18.02 14.11 18.71 6.4 +66 "F06" 78.75 80.96 20.26 38.16 43.99 9.51 +67 "F07" 7.01 62.38 35.44 10.52 19.33 8.14 +68 "F08" 1.48 41.62 59.96 7.96 11.49 16.13 +69 "F09" 4.66 38.88 62.1 8.63 11.3 17.86 +70 "F10" 8.56 33.53 76.84 10.41 11.24 27.64 +71 "F11" 76.83 8.82 46.69 21.49 12.15 9.52 +72 "F12" 9.9 12.54 14.91 3.04 3.15 2.73 +73 "G01" 95.27 94.34 100 74.73 77.5 64.38 +74 "G02" 98.55 34.63 57.21 44.51 29.8 15.52 +75 "G03" 71.71 37.83 33.38 24.34 19.34 8.11 +76 "G04" 74.92 38.56 10.79 25.26 19.88 4.38 +77 "G05" 36.15 59.64 1.53 13.65 19.52 4.62 +78 "G06" 79.26 82.87 1.12 36.49 43.18 5.73 +79 "G07" 31.42 73.13 50.51 19.42 29.58 14.51 +80 "G08" 5.45 70.76 91.77 19.86 28.9 37.67 +81 "G09" 9.76 53.95 72.09 14.15 18.75 25.13 +82 "G10" 12.93 35.04 69.77 10.69 11.62 23.13 +83 "G11" 91.13 23.55 63.45 31.57 19.76 17.91 +84 "G12" 49.85 49.34 53.67 18.91 19.64 16.46 +85 "H01" 50.01 49.47 53.83 18.98 19.71 16.53 +86 "H02" 94.23 19.84 47.13 33.5 20.33 9.91 +87 "H03" 84.08 49.98 45.1 34.67 28.65 13.17 +88 "H04" 63.04 25.22 10.51 16.86 12.12 2.75 +89 "H05" 49.17 72.98 8.29 21.16 30.06 6.66 +90 "H06" 90.01 92 51.94 52.08 58.65 19.39 +91 "H07" 51.68 69.17 35.96 22.63 29.16 10.83 +92 "H08" 22.67 69.1 84.54 21.74 29.15 34.08 +93 "H09" 2.08 53.56 85.09 13.59 18.65 33.2 +94 "H10" 18.2 48.01 90.52 17.32 18.86 39.16 +95 "H11" 84.22 29.36 61.76 29.3 19.82 17.88 +96 "H12" 95.28 94.34 100 74.65 77.41 64.27 +97 "I01" 9.95 12.59 14.99 3.05 3.16 2.74 +98 "I02" 63.39 42.06 52.1 22.03 19.1 15.09 +99 "I03" 76.57 55.72 50.91 31.97 28.79 15.9 +100 "I04" 98.78 37.3 25.86 42.69 29.41 6.24 +101 "I05" 97.3 98.04 99.89 82.21 85.41 69.86 +102 "I06" 65.58 65.98 70.9 30.96 32.15 26.58 +103 "I07" 44.74 45.12 49.16 16.49 17.18 14.34 +104 "I08" 24.98 26.86 30.43 7.03 7.28 6.15 +105 "I09" 39.67 65.7 88.49 24.91 29.34 38.48 +106 "I10" 52.39 60.56 94.9 29.04 29.31 45.2 +107 "I11" 95.98 42.83 73.82 41.09 29.82 26.18 +108 "I12" 9.92 12.58 15.07 3.05 3.16 2.75 +109 "J01" 95.23 94.32 100 74.72 77.5 64.44 +110 "J02" 77.57 32.64 54.49 26.91 19.35 14.94 +111 "J03" 83.29 53.78 37.02 34.54 29.66 11.16 +112 "J04" 100 52.92 30.05 58.1 42.93 8.71 +113 "J05" 92.1 89.96 96.97 64.14 66.75 54.99 +114 "J06" 98.88 99.51 99.69 87.06 90.39 72.76 +115 "J07" 98.8 99.45 99.69 86.82 90.15 72.56 +116 "J08" 15.3 18.64 21.56 4.28 4.47 3.84 +117 "J09" 35.08 63.84 96.62 24.87 28.59 45.17 +118 "J10" 65.98 70.7 100 41.47 42.2 57.7 +119 "J11" 99.15 59.59 84.68 53.38 42.55 36.49 +120 "J12" 49.87 49.36 53.7 18.92 19.65 16.47 +121 "K01" 49.99 49.46 53.81 18.97 19.7 16.52 +122 "K02" 86.58 49.77 60.7 36.7 29.69 19.45 +123 "K03" 88.67 51.5 28.75 36.83 30.22 8.83 +124 "K04" 98.88 62.08 32.27 53.42 43.05 10.13 +125 "K05" 85.31 83.06 90.88 51.78 53.86 44.86 +126 "K06" 98.81 99.46 99.68 86.85 90.18 72.55 +127 "K07" 98.82 99.48 99.69 86.91 90.25 72.64 +128 "K08" 12.06 14.95 17.22 3.45 3.59 3.07 +129 "K09" 6.92 67.52 99.04 21.49 28.73 46.46 +130 "K10" 50.08 42.95 86.74 21.85 19.42 36.39 +131 "K11" 75.42 56.11 68.02 32.48 29.05 24.22 +132 "K12" 95.27 94.32 100 74.63 77.39 64.28 +133 "L01" 9.84 12.49 14.92 3.03 3.14 2.73 +134 "L02" 98.98 57.11 74.4 53.85 42.1 29.27 +135 "L03" 99.89 50.46 60.72 58.21 42.93 21.15 +136 "L04" 99.29 46.21 3.17 40.96 30.79 3.87 +137 "L05" 75.24 75.43 81.94 40.79 42.45 35.04 +138 "L06" 57.21 57.01 61.15 23.51 24.47 20.31 +139 "L07" 34.32 36.31 40.46 11.1 11.62 9.8 +140 "L08" 9.82 12.45 14.75 3.02 3.13 2.71 +141 "L09" 33.27 77.33 99.89 31.86 41.84 53.57 +142 "L10" 33.9 16.63 45.96 7.9 6.16 10.17 +143 "L11" 98.43 80.02 96.18 62.34 57.68 47.93 +144 "L12" 9.86 12.49 14.83 3.03 3.14 2.72 +145 "M01" 95.25 94.34 100 74.74 77.52 64.43 +146 "M02" 99.99 73.82 90.19 68.21 58.76 45.3 +147 "M03" 99.19 58.74 71.9 54.32 42.79 26.91 +148 "M04" 99.98 75.49 34.17 68.17 58.65 13.41 +149 "M05" 99.35 99.63 30.25 76.51 80.88 14.08 +150 "M06" 25.3 54.85 59.81 15.06 19.36 18.82 +151 "M07" 12.74 75.9 44.48 16.03 29.31 11.79 +152 "M08" 79 86.77 95.63 52.05 57.11 51.73 +153 "M09" 42.83 80.8 96.51 32.54 42.52 46.33 +154 "M10" 29 19.89 40.72 7.2 6.19 8.57 +155 "M11" 97.05 93.04 100 78.01 78.48 67.07 +156 "M12" 49.89 49.41 53.72 18.93 19.67 16.48 +157 "N01" 50 49.45 53.79 18.97 19.7 16.51 +158 "N02" 99.34 79.72 88.26 65.97 60.13 42.01 +159 "N03" 96.25 63.6 74.67 50.5 42.33 28.58 +160 "N04" 99.27 81.88 42.08 63.78 59.07 15.95 +161 "N05" 99.65 82.63 11.45 62.58 58.72 7.2 +162 "N06" 26.24 70.63 78.27 21.33 29.57 29.73 +163 "N07" 9.82 75.76 59.79 17.06 29.9 17.13 +164 "N08" 76.26 84.42 99.75 54.05 58.63 61.58 +165 "N09" 68.69 87.9 99.27 49.41 57.82 58.22 +166 "N10" 58.46 25.45 64.62 16.9 12.02 19.29 +167 "N11" 97.22 42 83.28 41.76 29.82 32.52 +168 "N12" 95.29 94.35 100 74.67 77.43 64.28 +169 "O01" 9.82 12.45 14.75 3.02 3.13 2.71 +170 "O02" 91.01 68.56 77.87 47.1 42.51 31.08 +171 "O03" 97.63 62.78 50 51.87 42.51 15.81 +172 "O04" 98.83 97.18 92.89 77.2 77.91 50.55 +173 "O05" 98.9 73.19 0 45.99 42.6 4.49 +174 "O06" 40.94 68.1 75.26 23.64 29.5 29.06 +175 "O07" 41.16 87.88 60.49 26.97 42.73 19.28 +176 "O08" 59.59 63.21 73.49 27.97 29.35 28.33 +177 "O09" 75.74 88.91 93.15 50.32 57.45 48.38 +178 "O10" 63.01 42.18 68.33 23.06 19.58 23.21 +179 "O11" 69.87 57.18 83.37 32.18 29.25 34.95 +180 "O12" 9.77 12.4 14.67 3.01 3.12 2.7 +181 "P01" 95.25 94.32 100 74.64 77.41 64.32 +182 "P02" 84.46 72.89 80.48 44.39 42.98 33.4 +183 "P03" 100 72.99 59.81 71.49 59.42 23.1 +184 "P04" 100 97.78 79.43 79.86 78.26 38.44 +185 "P05" 80.84 60.67 1.37 31.59 29.6 5.37 +186 "P06" 25.93 70.68 69.27 20.07 28.76 23.92 +187 "P07" 50.83 83.03 73.17 31.22 42.07 27.31 +188 "P08" 37.02 50.17 67.49 17.15 18.99 23.19 +189 "P09" 65.74 78.01 85.01 37.97 42.95 38.15 +190 "P10" 54.49 46.66 57.66 19.91 19.24 17.99 +191 "P11" 79.86 72.98 93.2 44.36 43.41 45.48 +192 "P12" 49.95 49.42 53.74 18.95 19.68 16.49 +193 "Q01" 49.97 49.44 53.79 18.96 19.69 16.51 +194 "Q02" 95.79 84.32 88.88 59.99 58.87 41.85 +195 "Q03" 99.99 75.47 73.09 67.98 58.85 30.96 +196 "Q04" 100 95.41 90.21 82.15 79.03 48.34 +197 "Q05" 84.41 57.2 5.84 33.18 29.48 5.74 +198 "Q06" 9.17 72.73 77.86 18.92 29.39 27.97 +199 "Q07" 62.99 96.48 86.58 44.1 58.65 39.14 +200 "Q08" 71.85 77.1 70.94 37.51 41.38 26.69 +201 "Q09" 81.83 75.79 50.62 40.27 42.04 17.38 +202 "Q10" 53.2 64.94 64.37 24.86 28.48 22.3 +203 "Q11" 23.22 38.44 40.32 9.43 11.28 9.5 +204 "Q12" 95.28 94.33 100 74.61 77.37 64.24 +205 "R01" 9.95 12.59 14.99 3.05 3.16 2.74 +206 "R02" 71.47 61.11 61.93 31.16 30.09 20.86 +207 "R03" 93.36 84.53 83.13 56.92 56.98 36.53 +208 "R04" 99.7 95.07 97.1 79.37 78.57 56.95 +209 "R05" 89.21 74.18 15.19 42.68 42.54 8.26 +210 "R06" 35.67 84.82 81.93 28.15 41.91 31.53 +211 "R07" 77.72 93.12 78.3 48.61 58.02 33.46 +212 "R08" 62.64 63.77 53.68 26.81 28.91 16.95 +213 "R09" 81.95 77.86 34 39.83 43.08 12.47 +214 "R10" 41.4 34.94 25.31 11.8 11.72 5.87 +215 "R11" 40.7 52.5 53.8 17.1 19.71 16.41 +216 "R12" 9.82 12.45 14.75 3.02 3.13 2.71 +217 "S01" 95.25 94.32 100 74.66 77.43 64.34 +218 "S02" 78.68 76.08 69.89 40.67 42.42 26.09 +219 "S03" 94.62 94.65 86.45 65.09 68.67 41.71 +220 "S04" 0 10.44 63.73 3.01 3.34 15.4 +221 "S05" 0 57.08 10.66 3.26 11.22 2.89 +222 "S06" 82.88 0 10.83 17.7 8.11 0.42 +223 "S07" 99.49 100 99.75 89.01 92.27 74.63 +224 "S08" 0.01 0 0.02 0.28 0.29 0.24 +225 "S09" 99.68 99.73 0.01 72.92 74.82 4.56 +226 "S10" 81.93 0 35.68 17.03 7.57 3.05 +227 "S11" 0 45.14 76.9 6.56 11.29 24.29 +228 "S12" 49.85 49.34 53.67 18.91 19.64 16.46 +229 "T01" 49.85 49.34 53.67 18.91 19.64 16.46 +230 "T02" 9.97 12.59 14.91 3.05 3.16 2.73 +231 "T03" 95.15 94.21 99.99 74.38 77.15 64.2 +232 "T04" 49.92 49.43 53.72 18.94 19.68 16.48 +233 "T05" 10.35 13.04 15.35 3.12 3.24 2.79 +234 "T06" 95.13 94.16 99.93 74.2 76.97 63.98 +235 "T07" 49.74 49.3 53.61 18.87 19.61 16.43 +236 "T08" 9.84 12.67 14.89 3.04 3.16 2.73 +237 "T09" 95.22 94.29 99.96 74.41 77.19 64.05 +238 "T10" 49.82 49.33 53.67 18.9 19.63 16.46 +239 "T11" 10.16 12.77 15.31 3.09 3.2 2.78 +240 "T12" 95.28 94.32 100 74.57 77.32 64.19 +END_DATA diff --git a/scanin/Jamfile b/scanin/Jamfile index b6e58f1..57d90d2 100644 --- a/scanin/Jamfile +++ b/scanin/Jamfile @@ -8,7 +8,7 @@ PREF_LINKFLAGS += $(LINKDEBUGFLAG) ; Libraries = libscanrd ; Executables = scanin ; Headers = scanrd.h ; -Samples = it8.cht ColorChecker.cht ColorChecker.cie ColorCheckerDC.cht +Samples = it8.cht ColorChecker.cht ColorChecker.cie ColorCheckerDC.cht ColorCheckerDC.ti2 ColorCheckerSG.cht Hutchcolor.cht i1_RGB_Scan_1.4.cht ColorCheckerPassport.cht ColorCheckerPassport.cie QPcard_201.cht QPcard_201.cie QPcard_202.cht QPcard_202.cie CMP_DT_003.cht diff --git a/scanin/afiles b/scanin/afiles index bc4d9c7..d644c32 100644 --- a/scanin/afiles +++ b/scanin/afiles @@ -10,6 +10,7 @@ it8.cht ColorChecker.cht ColorChecker.cie ColorCheckerDC.cht +ColorCheckerDC.ti2 ColorCheckerSG.cht Hutchcolor.cht i1_RGB_Scan_1.4.cht diff --git a/scanin/scanin.c b/scanin/scanin.c index 94771fe..cacbd7d 100644 --- a/scanin/scanin.c +++ b/scanin/scanin.c @@ -145,7 +145,7 @@ int main(int argc, char *argv[]) static char tiffin_name[MAXNAMEL+1] = { 0 }; /* TIFF Input file name (.tif) */ static char datin_name[MAXNAMEL+4+1] = { 0 }; /* Data input name (.cie/.q60) */ static char datout_name[MAXNAMEL+4+1] = { 0 }; /* Data output name (.ti3/.val) */ - static char recog_name[MAXNAMEL+1] = { 0 }; /* Reference chart name (.cht) */ + static char recog_name[MAXNAMEL+1] = { 0 }; /* Reference chart name (.cht) */ static char prof_name[MAXNAMEL+1] = { 0 }; /* scanner profile name (.cht) */ static char diag_name[MAXNAMEL+1] = { 0 }; /* Diagnostic Output (.tif) name, if used */ int verb = 1; @@ -337,9 +337,11 @@ int main(int argc, char *argv[]) if (fa >= argc || argv[fa][0] == '-') usage(); strncpy(tiffin_name,argv[fa],MAXNAMEL); tiffin_name[MAXNAMEL] = '\000'; + /* Create a desination file path and name */ if (datout_name[0] == '\000' /* Not been overridden */ && (flags & SI_BUILD_REF) == 0 - && repl == 0 && colm == 0) { /* Not generate ref or replacing .ti3 dev */ + && repl == 0 && colm == 0) { /* Not generate ref or replacing .ti3 dev */ + // ~~~99 Hmm. Should we honour -O ?? char *xl; strncpy(datout_name,argv[fa],MAXNAMEL); datout_name[MAXNAMEL] = '\000'; if ((xl = strrchr(datout_name, '.')) == NULL) /* Figure where extention is */ @@ -369,7 +371,7 @@ int main(int argc, char *argv[]) if (repl != 0 || colm > 0) { /* Color from image or replacing .ti3 device data */ strcpy(datin_name,argv[fa]); strcat(datin_name,".ti2"); - strcpy(datout_name,argv[fa]); + strcpy(datout_name,argv[fa]); // ~~~99 Hmm. Should we honour -O ?? strcat(datout_name,".ti3"); } } -- cgit v1.2.3