Instrument |
@@ -1334,8 +1387,8 @@
style="font-weight: bold;">specbos 1211 and 1201
Tele-Spectro-Radiometer
-
+
Availability:
@@ -1352,8 +1405,8 @@
Image Engineering EX1
-
+
Availability:
@@ -1361,6 +1414,9 @@
href="http://www.image-engineering.de/iq-products/iq-tools/measurement-devices/ex1">Image
+
+
+
Engineering EX1 is a currently available instruments. This is
a high resolution spectrometer intended for the measurement of light
@@ -1372,7 +1428,7 @@ href="http://www.image-engineering.de/iq-products/iq-tools/measurement-devices/e
Klein K10-A Colorimeter
-
+
Availability:
@@ -1386,6 +1442,9 @@ href="http://www.image-engineering.de/iq-products/iq-tools/measurement-devices/e
+
+
+
Klein Instruments
@@ -1397,6 +1456,9 @@ href="http://www.image-engineering.de/iq-products/iq-tools/measurement-devices/e
+
+
+
is a currently available instrument. It is noted for it's speed,
high precision, and ability to measure to very low light
@@ -1708,6 +1770,9 @@ href="http://www.image-engineering.de/iq-products/iq-tools/measurement-devices/e
+
+
+
@@ -1774,6 +1839,9 @@ href="http://www.image-engineering.de/iq-products/iq-tools/measurement-devices/e
+
+
+
@@ -1821,6 +1889,9 @@ href="http://www.image-engineering.de/iq-products/iq-tools/measurement-devices/e
+
+
+
@@ -1884,6 +1955,9 @@ Gretag
+
+
+
@@ -2133,6 +2207,9 @@ Gretag
+
+
+
@@ -2167,6 +2244,9 @@ Gretag
+
+
+
@@ -2218,6 +2298,9 @@ Gretag
+
+
+
@@ -2265,6 +2348,9 @@ Gretag
+
+
+
@@ -2335,6 +2421,9 @@ href="http://www8.hp.com/us/en/products/oas/product-detail.html?oid=5225568">HP
+
+
+
DreamColor instruments are also reported to work. They will
appear as a be a the same as the i1Display Pro.
@@ -2405,56 +2494,9 @@ href="http://www8.hp.com/us/en/products/oas/product-detail.html?oid=5225568">HP
Availability:
- The Huey is widely
- available under the Pantone
- name as well as the manufacturer, X-Rite.
- There lower cost Huey is now discontinued, while the Huey
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Pro is still available.
+
The Huey and Huey
+ Pro are discontinued instruments. They may still be available
+ as old stock, or second hand.
Operation:
@@ -2500,6 +2542,9 @@ href="http://www.pantone.com/pages/products/product.aspx?pid=562&ca=2">Huey
+
+
+
@@ -2547,6 +2592,9 @@ href="http://www.pantone.com/pages/products/product.aspx?pid=562&ca=2">Huey
+
+
+
@@ -2619,6 +2667,9 @@ href="http://www.pantone.com/pages/products/product.aspx?pid=562&ca=2">Huey
+
+
+
@@ -2666,6 +2717,9 @@ href="http://www.pantone.com/pages/products/product.aspx?pid=562&ca=2">Huey
+
+
+
@@ -2684,7 +2738,7 @@ href="http://www.pantone.com/pages/products/product.aspx?pid=562&ca=2">Huey
The Spyder 2 has been superseded by the
- Spyder 3 & 4, but may be available second hand.
+ Spyder 5, but may be available second hand.
[The Spyder 1 has also been reported as working, but this has not
been confirmed.]
@@ -2746,6 +2800,9 @@ href="http://www.pantone.com/pages/products/product.aspx?pid=562&ca=2">Huey
+
+
+
@@ -2793,6 +2850,9 @@ href="http://www.pantone.com/pages/products/product.aspx?pid=562&ca=2">Huey
+
+
+
@@ -2826,8 +2886,8 @@ href="http://www.pantone.com/pages/products/product.aspx?pid=562&ca=2">Huey
The Spyder3Elite, Spyder3Pro and Spyder3Express are being
- superseded by the Spyder4, but may still stocked by some dealers,
+ style="font-weight: bold;">Spyder3Express have being
+ superseded by the Spyder 5, but may still stocked by some dealers,
and may be available second hand. The Spyder3Elite and Spyder3Pro
appear to be identical hardware with different software from the
@@ -2869,9 +2929,11 @@ href="http://www.pantone.com/pages/products/product.aspx?pid=562&ca=2">Huey
The Spyder4Elite, Spyder4Pro and Spyder4Express are a currently
- available instruments. The Spyder4Elite
- and Spyder4Pro appear to be
+ style="font-weight: bold;">Spyder4Express have being
+ superseded by the Spyder 5, but may still stocked by some dealers,
+ and may be available second hand. The Spyder4Elite and Spyder4Pro appear to be
identical hardware with different software from the manufacturer.
The Spyder4Express lacks
the ambient sensor.
@@ -2963,6 +3025,9 @@ href="http://www.pantone.com/pages/products/product.aspx?pid=562&ca=2">Huey
+
+
+
@@ -3019,6 +3084,9 @@ href="http://www.pantone.com/pages/products/product.aspx?pid=562&ca=2">Huey
+
+
+
@@ -3070,6 +3138,9 @@ href="http://www.pantone.com/pages/products/product.aspx?pid=562&ca=2">Huey
+
+
+
@@ -3089,7 +3160,7 @@ href="http://www.pantone.com/pages/products/product.aspx?pid=562&ca=2">Huey
colorimeter
+ src="Spyd5.jpg" width="449" height="350">
Availability:
@@ -3109,6 +3180,9 @@ href="http://www.pantone.com/pages/products/product.aspx?pid=562&ca=2">Huey
+
+
+
Calibration Spectral Sample) files, and this also gives the
instrument the capability of using a non-default standard observer.
@@ -3195,6 +3269,9 @@ href="http://www.pantone.com/pages/products/product.aspx?pid=562&ca=2">Huey
+
+
+
@@ -3251,6 +3328,9 @@ href="http://www.pantone.com/pages/products/product.aspx?pid=562&ca=2">Huey
+
+
+
@@ -3302,6 +3382,9 @@ href="http://www.pantone.com/pages/products/product.aspx?pid=562&ca=2">Huey
+
+
+
@@ -3363,6 +3446,9 @@ href="http://www.pantone.com/pages/products/product.aspx?pid=562&ca=2">Huey
+
+
+
@@ -3428,6 +3514,9 @@ href="http://www.pantone.com/pages/products/product.aspx?pid=562&ca=2">Huey
+
+
+
@@ -3475,6 +3564,9 @@ href="http://www.pantone.com/pages/products/product.aspx?pid=562&ca=2">Huey
+
+
+
@@ -3490,7 +3582,7 @@ href="http://www.pantone.com/pages/products/product.aspx?pid=562&ca=2">Huey
style="font-weight: bold;" class="titre">ColorHug
+ 194px;" width="552" height="623">
Availability:
@@ -3526,6 +3618,9 @@ href="http://www.pantone.com/pages/products/product.aspx?pid=562&ca=2">Huey
+
+
+
LCD, CCFL Backlight [Default]
c
@@ -3543,6 +3638,9 @@ href="http://www.pantone.com/pages/products/product.aspx?pid=562&ca=2">Huey
+
+
+
CRT display
p
@@ -3560,6 +3658,9 @@ href="http://www.pantone.com/pages/products/product.aspx?pid=562&ca=2">Huey
+
+
+
Projector
e
@@ -3576,6 +3677,9 @@ href="http://www.pantone.com/pages/products/product.aspx?pid=562&ca=2">Huey
+
+
+
LCD, White LED Backlight
F
@@ -3593,6 +3697,9 @@ href="http://www.pantone.com/pages/products/product.aspx?pid=562&ca=2">Huey
+
+
+
Factory matrix (For Calibration) [CB1]
R
@@ -3610,19 +3717,25 @@ href="http://www.pantone.com/pages/products/product.aspx?pid=562&ca=2">Huey
+
+
+
Raw Reading (For Factory matrix Calibration) [CB2]
- SwatchMate
+ Palette/SwatchMate
+
+
+
Cube
-
+
Availability:
- The Cube from SwatchMate
+ The Cube from Palette/SwatchMate
is a currently available entry level Colorimeter, with somewhat
limited accuracy. The ArgyllCMS driver provides two
@@ -3636,6 +3749,9 @@ href="http://www.pantone.com/pages/products/product.aspx?pid=562&ca=2">Huey
+
+
+
Matt surfaces [Default]
g
@@ -3653,12 +3769,18 @@ href="http://www.pantone.com/pages/products/product.aspx?pid=562&ca=2">Huey
+
+
+
Gloss surfaces
N
+
+
+
Native Calibration
diff --git a/doc/invprofcheck.html b/doc/invprofcheck.html
old mode 100755
new mode 100644
diff --git a/doc/kodak2ti3.html b/doc/kodak2ti3.html
old mode 100755
new mode 100644
diff --git a/doc/monitorcontrols.html b/doc/monitorcontrols.html
old mode 100755
new mode 100644
diff --git a/doc/mox.jpg b/doc/mox.jpg
old mode 100755
new mode 100644
diff --git a/doc/moxxr.jpg b/doc/moxxr.jpg
old mode 100755
new mode 100644
diff --git a/doc/mppcheck.html b/doc/mppcheck.html
old mode 100755
new mode 100644
diff --git a/doc/mpplu.html b/doc/mpplu.html
old mode 100755
new mode 100644
diff --git a/doc/mppprof.html b/doc/mppprof.html
old mode 100755
new mode 100644
diff --git a/doc/oeminst.html b/doc/oeminst.html
old mode 100755
new mode 100644
diff --git a/doc/printcal.html b/doc/printcal.html
old mode 100755
new mode 100644
diff --git a/doc/printtarg.html b/doc/printtarg.html
old mode 100755
new mode 100644
diff --git a/doc/profcheck.html b/doc/profcheck.html
old mode 100755
new mode 100644
diff --git a/doc/refine.html b/doc/refine.html
old mode 100755
new mode 100644
diff --git a/doc/revfix.html b/doc/revfix.html
old mode 100755
new mode 100644
diff --git a/doc/scanin.html b/doc/scanin.html
old mode 100755
new mode 100644
diff --git a/doc/sl.jpg b/doc/sl.jpg
old mode 100755
new mode 100644
diff --git a/doc/spec2cie.html b/doc/spec2cie.html
old mode 100755
new mode 100644
diff --git a/doc/specplot.html b/doc/specplot.html
old mode 100755
new mode 100644
diff --git a/doc/splitti3.html b/doc/splitti3.html
old mode 100755
new mode 100644
diff --git a/doc/spotread.html b/doc/spotread.html
old mode 100755
new mode 100644
diff --git a/doc/srgbplot.gif b/doc/srgbplot.gif
old mode 100755
new mode 100644
diff --git a/doc/ss.jpg b/doc/ss.jpg
old mode 100755
new mode 100644
diff --git a/doc/surface.jpg b/doc/surface.jpg
old mode 100755
new mode 100644
diff --git a/doc/synthcal.html b/doc/synthcal.html
old mode 100755
new mode 100644
diff --git a/doc/synthread.html b/doc/synthread.html
old mode 100755
new mode 100644
diff --git a/doc/targen.html b/doc/targen.html
old mode 100755
new mode 100644
diff --git a/doc/ti3_format.html b/doc/ti3_format.html
old mode 100755
new mode 100644
index 38a1eb7..559aa12
--- a/doc/ti3_format.html
+++ b/doc/ti3_format.html
@@ -57,6 +57,7 @@
+
"DISPLAY", "INPUT" or "EMISINPUT".
@@ -64,7 +65,7 @@
information is from. (An OUTPUT device is typically a printer. An
INPUT device is typically a Scanner or Camera with data from a
reflective reference chart. An EMISINPUT is a camera with emissive
- reference data. ).
+ rather than reflective reference data. ).
An "OUTPUT" type device may
have a TOTAL_INK_LIMIT
@@ -81,6 +82,7 @@
+
119.657745 121.474236".
A display device may also have a 0) {
//a1logd(g_log, 1," run out of primaries\n");
break; /* Looked at primary */
}
- if (usels[*s] == ((char)-1)) { /* If this selector is not currently used */
-//a1logd(g_log, 1," set to '%c' at %d\n", *s, i);
- sel[0] = *s; /* Use it */
- sel[1] = '\000';
- usels[*s] = ix;
- return 0;
+ if (usels[*isel] == ((char)-1)) { /* If this selector is not currently used */
+//a1logd(g_log, 1," added to '%c' from %d\n", *isel, i);
+ osel[0] = *isel; /* Use it */
+ osel[1] = '\000';
+ usels[osel[0]] = ix;
+
+ /* Remove all used/discarded from isel, in case we are called again. */
+ for (isel++; ;isel++, iisel++) {
+ *iisel = *isel;
+ if (*isel == '\000')
+ break;
+ }
+ return;
}
-//a1logd(g_log, 1," sel '%c' at %d is used by ix %d\n", *s, i, usels[*s]);
+//a1logd(g_log, 1," sel '%c' at %d is used by ix %d\n", *isel, i, usels[*isel]);
}
- if (flag <= 2) {
-//a1logd(g_log, 1," returning unset\n");
- return 1;
+ /* If we get here, we haven't managed to add anything from the remaining */
+ /* selectors, so mark the candidate list as empty: */
+ iisel[0] = '\000';
+
+ if (flag != 2) {
+//a1logd(g_log, 1," returning without add\n");
+ return;
}
/* Get the next unused char in fallback list */
@@ -442,22 +462,16 @@ int disptechs_set_sel(
}
if (asels[*k] != '\000') {
//a1logd(g_log, 1," set int to fallback '%c' at %d\n", asels[*k], *k);
- sel[0] = asels[*k];
- sel[1] = '\000';
- usels[sel[0]] = ix;
+ osel[0] = asels[*k];
+ osel[1] = '\000';
+ usels[osel[0]] = ix;
(*k)++;
- return 0;
- }
-
- /* Set any unset to nul */
- if (flag >= 3) {
-//a1logd(g_log, 1," clearing\n");
- sel[0] = '\000';
+ return;
}
-//a1logd(g_log, 1," failed\n");
- /* If we got here, we failed */
- return 1;
+//a1logd(g_log, 1," returning after fallback without add\n");
+ /* If we got here, we failed to add a selector */
+ return;
}
/* Return the display tech list with unique lsel lectors */
@@ -474,18 +488,19 @@ disptech_info *disptech_get_list() {
/* Add entries from the static list and their primary selectors */
for (i = 0; list[i].dtech != disptech_end; i++) {
-//a1logd(1,"tech[%d] '%s' sels = '%s'\n",i,list[i].desc,list[i].sel);
- strcpy(list[i].lsel, list[i].sel);
- disptechs_set_sel(0, i, list[i].lsel, usels, &k, asels);
+//a1logd(g_log,1,"tech[%d] '%s' sels = '%s'\n",i,list[i].desc,list[i].sel);
+ strcpy(list[i].isel, list[i].sel);
+ list[i].lsel[0] = '\000';
+ disptechs_set_sel(0, i, list[i].lsel, list[i].isel, usels, &k, asels);
}
/* Set selectors from secondary */
for (i = 0; list[i].dtech != disptech_end; i++)
- disptechs_set_sel(1, i, list[i].lsel, usels, &k, asels);
+ disptechs_set_sel(1, i, list[i].lsel, list[i].isel, usels, &k, asels);
/* Set remainder from fallback */
for (i = 0; list[i].dtech != disptech_end; i++)
- disptechs_set_sel(3, i, list[i].lsel, usels, &k, asels);
+ disptechs_set_sel(2, i, list[i].lsel, list[i].isel, usels, &k, asels);
return list;
}
diff --git a/spectro/disptechs.h b/spectro/disptechs.h
old mode 100755
new mode 100644
index 68245cf..9860eac
--- a/spectro/disptechs.h
+++ b/spectro/disptechs.h
@@ -114,6 +114,7 @@ struct _disptech_info {
/* Private: */
char lsel[10]; /* Unique list selector for ui */
+ char isel[10]; /* Candidate selectors */
}; typedef struct _disptech_info disptech_info;
@@ -137,7 +138,7 @@ disptech_info *disptech_select(disptech_info *list, char c);
/* utility function, used by disptech_get_list & inst_creat_disptype_list() */
/* See disptechs.c for parameter description. */
-int disptechs_set_sel(int flag, int ix, char *sel, char *usels, int *k, char *asels);
+void disptechs_set_sel(int flag, int ix, char *osel, char *isel, char *usels, int *k, char *asels);
/* - - - - - - - - - - */
/* Display settling time model */
diff --git a/spectro/dispwin.c b/spectro/dispwin.c
old mode 100755
new mode 100644
diff --git a/spectro/dispwin.h b/spectro/dispwin.h
old mode 100755
new mode 100644
diff --git a/spectro/dtp20.c b/spectro/dtp20.c
old mode 100755
new mode 100644
diff --git a/spectro/dtp20.h b/spectro/dtp20.h
old mode 100755
new mode 100644
diff --git a/spectro/dtp22.c b/spectro/dtp22.c
old mode 100755
new mode 100644
diff --git a/spectro/dtp22.h b/spectro/dtp22.h
old mode 100755
new mode 100644
diff --git a/spectro/dtp41.c b/spectro/dtp41.c
old mode 100755
new mode 100644
diff --git a/spectro/dtp41.h b/spectro/dtp41.h
old mode 100755
new mode 100644
diff --git a/spectro/dtp51.c b/spectro/dtp51.c
old mode 100755
new mode 100644
diff --git a/spectro/dtp51.h b/spectro/dtp51.h
old mode 100755
new mode 100644
diff --git a/spectro/dtp92.c b/spectro/dtp92.c
old mode 100755
new mode 100644
diff --git a/spectro/dtp92.h b/spectro/dtp92.h
old mode 100755
new mode 100644
diff --git a/spectro/ex1.c b/spectro/ex1.c
old mode 100755
new mode 100644
diff --git a/spectro/ex1.h b/spectro/ex1.h
old mode 100755
new mode 100644
diff --git a/spectro/fakeread.c b/spectro/fakeread.c
old mode 100755
new mode 100644
diff --git a/spectro/hcfr.c b/spectro/hcfr.c
old mode 100755
new mode 100644
diff --git a/spectro/hcfr.h b/spectro/hcfr.h
old mode 100755
new mode 100644
diff --git a/spectro/hidio.c b/spectro/hidio.c
old mode 100755
new mode 100644
diff --git a/spectro/hidio.h b/spectro/hidio.h
old mode 100755
new mode 100644
diff --git a/spectro/huey.c b/spectro/huey.c
old mode 100755
new mode 100644
diff --git a/spectro/huey.h b/spectro/huey.h
old mode 100755
new mode 100644
diff --git a/spectro/i1d3.c b/spectro/i1d3.c
old mode 100755
new mode 100644
diff --git a/spectro/i1d3.h b/spectro/i1d3.h
old mode 100755
new mode 100644
diff --git a/spectro/i1disp.c b/spectro/i1disp.c
old mode 100755
new mode 100644
diff --git a/spectro/i1disp.h b/spectro/i1disp.h
old mode 100755
new mode 100644
diff --git a/spectro/i1pro.c b/spectro/i1pro.c
old mode 100755
new mode 100644
diff --git a/spectro/i1pro.h b/spectro/i1pro.h
old mode 100755
new mode 100644
diff --git a/spectro/i1pro_imp.c b/spectro/i1pro_imp.c
old mode 100755
new mode 100644
diff --git a/spectro/i1pro_imp.h b/spectro/i1pro_imp.h
old mode 100755
new mode 100644
diff --git a/spectro/icoms.c b/spectro/icoms.c
old mode 100755
new mode 100644
diff --git a/spectro/icoms.h b/spectro/icoms.h
old mode 100755
new mode 100644
diff --git a/spectro/icoms_nt.c b/spectro/icoms_nt.c
old mode 100755
new mode 100644
diff --git a/spectro/icoms_ux.c b/spectro/icoms_ux.c
old mode 100755
new mode 100644
diff --git a/spectro/ifiles b/spectro/ifiles
old mode 100755
new mode 100644
diff --git a/spectro/illumread.c b/spectro/illumread.c
old mode 100755
new mode 100644
diff --git a/spectro/inflate.c b/spectro/inflate.c
old mode 100755
new mode 100644
diff --git a/spectro/inst.c b/spectro/inst.c
old mode 100755
new mode 100644
index ba12f9d..949e34f
--- a/spectro/inst.c
+++ b/spectro/inst.c
@@ -875,9 +875,11 @@ int doccmx /* Add matching installed ccmx files */
usels[i] = ((char)-1);
k = 0; /* Next selector index */
+ /* First create a list of calibrations and their desired selectors: */
+
/* Add entries from the static list and their primary selectors */
/* (We're currently assuming that calibrations that the instrument */
- /* returns are not custom) */
+ /* returns are not custom.) */
/* Count the number in the static list. */
for (i = 0; !(sdtlist[i].flags & inst_dtflags_end); i++) {
@@ -966,25 +968,52 @@ int doccmx /* Add matching installed ccmx files */
}
}
+ /* Copy candidate selectors to private isel[] list */
+ for (i = 0; i < nlist; i++) {
+ strcpy(list[i].isel, list[i].sel);
+ list[i].sel[0] = '\000';
+ }
+
+ /* Then allocate a slector for each calibration: */
+
/* Set selectors from primary for cbid or custom first */
for (i = 0; i < nlist; i++) {
if (list[i].cbid > 0
|| (list[i].flags & inst_dtflags_custom) != 0) {
- disptechs_set_sel(0, i, list[i].sel, usels, &k, asels);
+ disptechs_set_sel(0, i, list[i].sel, list[i].isel, usels, &k, asels);
}
}
/* Set selectors from primary for rest */
for (i = 0; i < nlist; i++)
- disptechs_set_sel(0, i, list[i].sel, usels, &k, asels);
+ disptechs_set_sel(0, i, list[i].sel, list[i].isel, usels, &k, asels);
- /* Set remaining selectors from secondaries */
+ /* Set remaining selectors from primaries or secondaries */
for (i = 0; i < nlist; i++)
- disptechs_set_sel(1, i, list[i].sel, usels, &k, asels);
+ disptechs_set_sel(1, i, list[i].sel, list[i].isel, usels, &k, asels);
- /* Set remaining from fallback (or give up and set to null) */
+ /* Set remaining from fallback */
for (i = 0; i < nlist; i++) {
- fail = disptechs_set_sel(3, i, list[i].sel, usels, &k, asels);
+ disptechs_set_sel(2, i, list[i].sel, list[i].isel, usels, &k, asels);
+ if (list[i].sel[0] == '\000')
+ fail = 1;
+ }
+
+ /* Any calibrations that failed to find a character will be left as a nul string */
+
+ /* Add alternate selectors if they are free. */
+ for (;;) {
+ int more = 0;
+ for (i = 0; i < nlist; i++) {
+ /* Add unused secondaries */
+ disptechs_set_sel(3, i, list[i].sel, list[i].isel, usels, &k, asels);
+
+ if (list[i].isel[0] != '\000') { /* Still more secondaries available */
+ more = 1;
+ }
+ }
+ if (!more)
+ break;
}
if (pndtlist != NULL)
diff --git a/spectro/inst.h b/spectro/inst.h
old mode 100755
new mode 100644
index 00dd9b3..d47f7ea
--- a/spectro/inst.h
+++ b/spectro/inst.h
@@ -390,6 +390,7 @@ typedef struct _inst_disptypesel {
/* Private: */
int ix; /* Internal index, */
+ char isel[INST_DTYPE_SEL_LEN]; /* String of potential selector characters */
// Stuff for ccss & ccmx
char *path; /* Path to ccss or ccmx. NULL if not valid */
diff --git a/spectro/instappsup.c b/spectro/instappsup.c
old mode 100755
new mode 100644
diff --git a/spectro/instappsup.h b/spectro/instappsup.h
old mode 100755
new mode 100644
diff --git a/spectro/instlib.ksh b/spectro/instlib.ksh
old mode 100755
new mode 100644
diff --git a/spectro/instlib.txt b/spectro/instlib.txt
old mode 100755
new mode 100644
diff --git a/spectro/insttypeinst.h b/spectro/insttypeinst.h
old mode 100755
new mode 100644
diff --git a/spectro/insttypes.c b/spectro/insttypes.c
old mode 100755
new mode 100644
diff --git a/spectro/insttypes.h b/spectro/insttypes.h
old mode 100755
new mode 100644
diff --git a/spectro/iusb.h b/spectro/iusb.h
old mode 100755
new mode 100644
diff --git a/spectro/kleink10.c b/spectro/kleink10.c
old mode 100755
new mode 100644
diff --git a/spectro/kleink10.h b/spectro/kleink10.h
old mode 100755
new mode 100644
diff --git a/spectro/linear.cal b/spectro/linear.cal
old mode 100755
new mode 100644
index ac93eb5..96cad93
--- a/spectro/linear.cal
+++ b/spectro/linear.cal
@@ -2,7 +2,7 @@ CAL
DESCRIPTOR "Argyll Device Calibration Curves"
ORIGINATOR "Argyll synthcal"
-CREATED "Tue Aug 18 00:14:21 2015"
+CREATED "Mon Sep 07 03:37:56 2015"
DEVICE_CLASS "DISPLAY"
COLOR_REP "RGB"
diff --git a/spectro/linear.sp b/spectro/linear.sp
old mode 100755
new mode 100644
diff --git a/spectro/madvrwin.c b/spectro/madvrwin.c
old mode 100755
new mode 100644
diff --git a/spectro/madvrwin.h b/spectro/madvrwin.h
old mode 100755
new mode 100644
diff --git a/spectro/mongoose.c b/spectro/mongoose.c
old mode 100755
new mode 100644
diff --git a/spectro/mongoose.h b/spectro/mongoose.h
old mode 100755
new mode 100644
diff --git a/spectro/munki.c b/spectro/munki.c
old mode 100755
new mode 100644
diff --git a/spectro/munki.h b/spectro/munki.h
old mode 100755
new mode 100644
diff --git a/spectro/munki_imp.c b/spectro/munki_imp.c
old mode 100755
new mode 100644
diff --git a/spectro/munki_imp.h b/spectro/munki_imp.h
old mode 100755
new mode 100644
diff --git a/spectro/oemarch.c b/spectro/oemarch.c
old mode 100755
new mode 100644
diff --git a/spectro/oemarch.h b/spectro/oemarch.h
old mode 100755
new mode 100644
diff --git a/spectro/oeminst.c b/spectro/oeminst.c
old mode 100755
new mode 100644
diff --git a/spectro/pollem.c b/spectro/pollem.c
old mode 100755
new mode 100644
diff --git a/spectro/pollem.h b/spectro/pollem.h
old mode 100755
new mode 100644
diff --git a/spectro/rspec.c b/spectro/rspec.c
old mode 100755
new mode 100644
diff --git a/spectro/rspec.h b/spectro/rspec.h
old mode 100755
new mode 100644
diff --git a/spectro/smcube.c b/spectro/smcube.c
old mode 100755
new mode 100644
diff --git a/spectro/smcube.h b/spectro/smcube.h
old mode 100755
new mode 100644
diff --git a/spectro/spec2cie.c b/spectro/spec2cie.c
old mode 100755
new mode 100644
index c9e570c..aa91ebb
--- a/spectro/spec2cie.c
+++ b/spectro/spec2cie.c
@@ -514,8 +514,10 @@ main(int argc, char *argv[])
{
int sidx; /* Sample ID index */
- int ti, ii, Xi, Yi, Zi, Li, ai, bi;
+ int ti, ii;
+ int Xi, Yi, Zi, Li, ai, bi; /* CGATS indexes for each field */
int spi[XSPECT_MAX_BANDS]; /* CGATS indexes for each wavelength */
+ int oXi, oYi, oZi, oLi, oai, obi; /* CGATS indexes for each ouput field */
xsp2cie *sp2cie; /* Spectral conversion object */
xspect sp;
double XYZ[3];
@@ -572,13 +574,17 @@ main(int argc, char *argv[])
/* copy fields to output file (except spectral if nospec) */
for (i = 0; i < icg->t[0].nfields; i++) {
- /* See if this is a input spectral field */
- for (j = 0; nospec && j < sp.spec_n; j++) {
- if (spi[j] == i)
- break; /* Yes it is */
+
+ if (nospec) {
+ for (j = 0; nospec && j < sp.spec_n; j++) {
+ if (spi[j] == i) {
+ break; /* Yes it is */
+ }
+ }
+ if (j < sp.spec_n)
+ continue; /* Skip it */
}
- if (nospec == 0 || j >= sp.spec_n)
- ocg->add_field (ocg, 0, icg->t[0].fsym[i], icg->t[0].ftype[i]);
+ ocg->add_field (ocg, 0, icg->t[0].fsym[i], icg->t[0].ftype[i]);
}
/* create field for XYZ and Lab if not present */
@@ -607,6 +613,13 @@ main(int argc, char *argv[])
if ((bi = ocg->add_field(ocg, 0, "LAB_B", r_t)) < 0)
error ("Cannot add field to table");
+ oXi = Xi;
+ oYi = Yi;
+ oZi = Zi;
+ oLi = Li;
+ oai = ai;
+ obi = bi;
+
/* allocate elements */
if ((elems = (cgats_set_elem *)
@@ -746,25 +759,40 @@ main(int argc, char *argv[])
xspect corr_sp;
/* copy all input colums to output (except spectral if nospec) */
-
for (jj = j = 0; j < icg->t[0].nfields; j++) {
- for (k = 0; nospec && k < sp.spec_n; k++) {
- if (spi[k] == j)
- break;
- }
- if (nospec == 0 || k >= sp.spec_n) {
- switch (icg->t[0].ftype[j]) {
- case r_t:
- elems[jj].d = *((double *) icg->t[0].fdata[i][j]);
- break;
- case i_t:
- elems[jj].i = *((int *) icg->t[0].fdata[i][j]);
+
+ if (nospec) {
+ /* See if this is a spectral field */
+ for (k = 0; nospec && k < sp.spec_n; k++) {
+ if (spi[k] == j)
break;
- default:
- elems[jj].c = (char *) icg->t[0].fdata[i][j];
}
- jj++;
+
+ /* It is a spectral field */
+ if (k < sp.spec_n) {
+ continue; /* Skip it */
+ }
}
+
+ /* Correct the other fields location in output */
+ if (j == Xi) oXi = jj;
+ if (j == Yi) oYi = jj;
+ if (j == Zi) oZi = jj;
+ if (j == Li) oLi = jj;
+ if (j == ai) oai = jj;
+ if (j == bi) obi = jj;
+
+ switch (icg->t[0].ftype[j]) {
+ case r_t:
+ elems[jj].d = *((double *) icg->t[0].fdata[i][j]);
+ break;
+ case i_t:
+ elems[jj].i = *((int *) icg->t[0].fdata[i][j]);
+ break;
+ default:
+ elems[jj].c = (char *) icg->t[0].fdata[i][j];
+ }
+ jj++;
}
/* Read the spectral values for this patch */
@@ -781,63 +809,16 @@ main(int argc, char *argv[])
/* Write the corrected spectral values for this patch */
if (nospec == 0) {
for (j = 0; j < sp.spec_n; j++) {
- elems[spi[j]].d = corr_sp.spec[j];
+ elems[spi[j]].d = sp.spec[j] = corr_sp.spec[j];
}
}
-#ifdef ALLOW_PLOT
- if (doplot) {
- int ii;
- double xx[XRES];
- double y1[XRES];
- double y2[XRES];
- double lab[3];
-
- icmXYZ2Lab(&icmD50, lab, XYZ);
- printf("Patch %d, XYZ = %f %f %f, Lab = %f %f %f\n",i,
- XYZ[0], XYZ[1], XYZ[2], lab[0], lab[1], lab[2]);
-
- /* Plot spectrum out */
- for (ii = 0; ii < XRES; ii++) {
- double ww;
-
- ww = (sp.spec_wl_long - sp.spec_wl_short)
- * ((double)ii/(XRES-1.0)) + sp.spec_wl_short;
-
- xx[ii] = ww;
- y1[ii] = value_xspect(&sp, ww);
- y2[ii] = 100.0 * value_xspect(&corr_sp, ww);
- }
- do_plot(xx,y1,y2,NULL,ii);
- }
-#endif
}
+
+ /* No FWA comp */
else {
/* Convert it to CIE space */
sp2cie->convert (sp2cie, XYZ, &sp);
-#ifdef ALLOW_PLOT
- if (doplot) {
- int ii;
- double xx[XRES];
- double y1[XRES];
- double lab[3];
-
- icmXYZ2Lab(&icmD50, lab, XYZ);
- printf("Patch %d, XYZ = %f %f %f, Lab = %f %f %f\n",i,
- XYZ[0], XYZ[1], XYZ[2], lab[0], lab[1], lab[2]);
-
- /* Plot spectrum out */
- for (ii = 0; ii < XRES; ii++) {
- double ww;
-
- ww = (sp.spec_wl_long - sp.spec_wl_short)
- * ((double)ii/(XRES-1.0)) + sp.spec_wl_short;
-
- xx[ii] = ww;
- y1[ii] = value_xspect(&sp, ww);
- }
- do_plot(xx,y1,NULL,NULL,ii);
- }
-#endif
+
}
/* Could use sp2cie->get_cie_il() to get CIE white point */
@@ -846,13 +827,35 @@ main(int argc, char *argv[])
/* This won't work for emmisive though, since get_cie_il() will return 'E' */
icmXYZ2Lab(&icmD50, Lab, XYZ);
- elems[Xi].d = XYZ[0] * 100.0;
- elems[Yi].d = XYZ[1] * 100.0;
- elems[Zi].d = XYZ[2] * 100.0;
+#ifdef ALLOW_PLOT
+ if (doplot) {
+ int ii;
+ double xx[XRES];
+ double y1[XRES];
+
+ printf("Patch %d, XYZ = %f %f %f, Lab = %f %f %f\n",i,
+ XYZ[0], XYZ[1], XYZ[2], Lab[0], Lab[1], Lab[2]);
+
+ /* Plot spectrum out */
+ for (ii = 0; ii < XRES; ii++) {
+ double ww;
+
+ ww = (sp.spec_wl_long - sp.spec_wl_short)
+ * ((double)ii/(XRES-1.0)) + sp.spec_wl_short;
+
+ xx[ii] = ww;
+ y1[ii] = value_xspect(&sp, ww);
+ }
+ do_plot(xx,y1,NULL,NULL,ii);
+ }
+#endif
+ elems[oXi].d = XYZ[0] * 100.0;
+ elems[oYi].d = XYZ[1] * 100.0;
+ elems[oZi].d = XYZ[2] * 100.0;
- elems[Li].d = Lab[0];
- elems[ai].d = Lab[1];
- elems[bi].d = Lab[2];
+ elems[oLi].d = Lab[0];
+ elems[oai].d = Lab[1];
+ elems[obi].d = Lab[2];
ocg->add_setarr(ocg, 0, elems);
}
@@ -866,7 +869,7 @@ main(int argc, char *argv[])
ocg->del (ocg); /* Clean up */
icg->del (icg); /* Clean up */
- free (elems);
+ free (elems);
}
return 0;
diff --git a/spectro/specbos.c b/spectro/specbos.c
old mode 100755
new mode 100644
diff --git a/spectro/specbos.h b/spectro/specbos.h
old mode 100755
new mode 100644
diff --git a/spectro/spotread.c b/spectro/spotread.c
old mode 100755
new mode 100644
diff --git a/spectro/spyd2.c b/spectro/spyd2.c
old mode 100755
new mode 100644
diff --git a/spectro/spyd2.h b/spectro/spyd2.h
old mode 100755
new mode 100644
diff --git a/spectro/ss.c b/spectro/ss.c
old mode 100755
new mode 100644
diff --git a/spectro/ss.h b/spectro/ss.h
old mode 100755
new mode 100644
diff --git a/spectro/ss_imp.c b/spectro/ss_imp.c
old mode 100755
new mode 100644
diff --git a/spectro/ss_imp.h b/spectro/ss_imp.h
old mode 100755
new mode 100644
diff --git a/spectro/strange.cal b/spectro/strange.cal
old mode 100755
new mode 100644
index 06725b0..406fba4
--- a/spectro/strange.cal
+++ b/spectro/strange.cal
@@ -2,7 +2,7 @@ CAL
DESCRIPTOR "Argyll Device Calibration Curves"
ORIGINATOR "Argyll synthcal"
-CREATED "Tue Aug 18 00:14:21 2015"
+CREATED "Mon Sep 07 03:37:56 2015"
DEVICE_CLASS "DISPLAY"
COLOR_REP "RGB"
diff --git a/spectro/synthcal.c b/spectro/synthcal.c
old mode 100755
new mode 100644
diff --git a/spectro/synthread.c b/spectro/synthread.c
old mode 100755
new mode 100644
diff --git a/spectro/usbio.c b/spectro/usbio.c
old mode 100755
new mode 100644
diff --git a/spectro/usbio.h b/spectro/usbio.h
old mode 100755
new mode 100644
diff --git a/spectro/usbio_bsd.c b/spectro/usbio_bsd.c
old mode 100755
new mode 100644
diff --git a/spectro/usbio_lx.c b/spectro/usbio_lx.c
old mode 100755
new mode 100644
diff --git a/spectro/usbio_nt.c b/spectro/usbio_nt.c
old mode 100755
new mode 100644
diff --git a/spectro/usbio_ox.c b/spectro/usbio_ox.c
old mode 100755
new mode 100644
diff --git a/spectro/vinflate.c b/spectro/vinflate.c
old mode 100755
new mode 100644
diff --git a/spectro/webwin.c b/spectro/webwin.c
old mode 100755
new mode 100644
diff --git a/spectro/webwin.h b/spectro/webwin.h
old mode 100755
new mode 100644
diff --git a/spectro/xdg_bds.c b/spectro/xdg_bds.c
old mode 100755
new mode 100644
diff --git a/spectro/xdg_bds.h b/spectro/xdg_bds.h
old mode 100755
new mode 100644
diff --git a/target/ColorChecker.ti2 b/target/ColorChecker.ti2
old mode 100755
new mode 100644
diff --git a/target/ECI2002.ti2 b/target/ECI2002.ti2
old mode 100755
new mode 100644
diff --git a/target/ECI2002R.ti2 b/target/ECI2002R.ti2
old mode 100755
new mode 100644
diff --git a/target/FograStrip2.ti1 b/target/FograStrip2.ti1
old mode 100755
new mode 100644
diff --git a/target/FograStrip2_2.ti2 b/target/FograStrip2_2.ti2
old mode 100755
new mode 100644
diff --git a/target/FograStrip3.ti1 b/target/FograStrip3.ti1
old mode 100755
new mode 100644
diff --git a/target/FograStrip3_3.ti2 b/target/FograStrip3_3.ti2
old mode 100755
new mode 100644
diff --git a/target/Jamfile b/target/Jamfile
old mode 100755
new mode 100644
diff --git a/target/License.txt b/target/License.txt
old mode 100755
new mode 100644
diff --git a/target/Readme.txt b/target/Readme.txt
old mode 100755
new mode 100644
diff --git a/target/afiles b/target/afiles
old mode 100755
new mode 100644
diff --git a/target/alphix.c b/target/alphix.c
old mode 100755
new mode 100644
diff --git a/target/alphix.h b/target/alphix.h
old mode 100755
new mode 100644
diff --git a/target/filmtarg.c b/target/filmtarg.c
old mode 100755
new mode 100644
diff --git a/target/i1_RGB_Scan_1.4.ti2 b/target/i1_RGB_Scan_1.4.ti2
old mode 100755
new mode 100644
diff --git a/target/ifarp.c b/target/ifarp.c
old mode 100755
new mode 100644
diff --git a/target/ifarp.h b/target/ifarp.h
old mode 100755
new mode 100644
diff --git a/target/ofps.c b/target/ofps.c
old mode 100755
new mode 100644
diff --git a/target/ofps.h b/target/ofps.h
old mode 100755
new mode 100644
diff --git a/target/ppoint.c b/target/ppoint.c
old mode 100755
new mode 100644
diff --git a/target/ppoint.h b/target/ppoint.h
old mode 100755
new mode 100644
diff --git a/target/prand.c b/target/prand.c
old mode 100755
new mode 100644
diff --git a/target/prand.h b/target/prand.h
old mode 100755
new mode 100644
diff --git a/target/printtarg.c b/target/printtarg.c
old mode 100755
new mode 100644
diff --git a/target/randix.c b/target/randix.c
old mode 100755
new mode 100644
diff --git a/target/randix.h b/target/randix.h
old mode 100755
new mode 100644
diff --git a/target/simdlat.c b/target/simdlat.c
old mode 100755
new mode 100644
diff --git a/target/simdlat.h b/target/simdlat.h
old mode 100755
new mode 100644
diff --git a/target/simplat.c b/target/simplat.c
old mode 100755
new mode 100644
diff --git a/target/simplat.h b/target/simplat.h
old mode 100755
new mode 100644
diff --git a/target/targen.c b/target/targen.c
old mode 100755
new mode 100644
diff --git a/target/targen.h b/target/targen.h
old mode 100755
new mode 100644
diff --git a/ttbd.txt b/ttbd.txt
old mode 100755
new mode 100644
diff --git a/tweak/Jamfile b/tweak/Jamfile
old mode 100755
new mode 100644
diff --git a/tweak/License.txt b/tweak/License.txt
old mode 100755
new mode 100644
diff --git a/tweak/Readme.txt b/tweak/Readme.txt
old mode 100755
new mode 100644
diff --git a/tweak/afiles b/tweak/afiles
old mode 100755
new mode 100644
diff --git a/tweak/refine.c b/tweak/refine.c
old mode 100755
new mode 100644
diff --git a/ucmm/Jamfile b/ucmm/Jamfile
old mode 100755
new mode 100644
diff --git a/ucmm/afiles b/ucmm/afiles
old mode 100755
new mode 100644
diff --git a/ucmm/ucmm.c b/ucmm/ucmm.c
old mode 100755
new mode 100644
diff --git a/ucmm/ucmm.h b/ucmm/ucmm.h
old mode 100755
new mode 100644
diff --git a/usb/45-Argyll.rules b/usb/45-Argyll.rules
old mode 100755
new mode 100644
diff --git a/usb/55-Argyll.rules b/usb/55-Argyll.rules
old mode 100755
new mode 100644
diff --git a/usb/Argyll b/usb/Argyll
old mode 100755
new mode 100644
diff --git a/usb/Argyll.kext/Info.plist b/usb/Argyll.kext/Info.plist
old mode 100755
new mode 100644
diff --git a/usb/Argyll.usermap b/usb/Argyll.usermap
old mode 100755
new mode 100644
diff --git a/usb/ArgyllCMS.cat b/usb/ArgyllCMS.cat
old mode 100755
new mode 100644
index 6d0305e..91c5a81
Binary files a/usb/ArgyllCMS.cat and b/usb/ArgyllCMS.cat differ
diff --git a/usb/ArgyllCMS.inf b/usb/ArgyllCMS.inf
old mode 100755
new mode 100644
diff --git a/usb/ArgyllCMS.inf.d b/usb/ArgyllCMS.inf.d
old mode 100755
new mode 100644
diff --git a/usb/ArgyllCMS.inf.t b/usb/ArgyllCMS.inf.t
old mode 100755
new mode 100644
diff --git a/usb/ArgyllCMS_x64.cat b/usb/ArgyllCMS_x64.cat
old mode 100755
new mode 100644
index e1f12c6..24b915e
Binary files a/usb/ArgyllCMS_x64.cat and b/usb/ArgyllCMS_x64.cat differ
diff --git a/usb/Jamfile b/usb/Jamfile
old mode 100755
new mode 100644
diff --git a/usb/afiles b/usb/afiles
old mode 100755
new mode 100644
diff --git a/usb/binfiles.lx b/usb/binfiles.lx
old mode 100755
new mode 100644
diff --git a/usb/binfiles.msw b/usb/binfiles.msw
old mode 100755
new mode 100644
diff --git a/usb/binfiles.osx b/usb/binfiles.osx
old mode 100755
new mode 100644
diff --git a/usb/driver/AUTHORS.txt b/usb/driver/AUTHORS.txt
old mode 100755
new mode 100644
diff --git a/usb/driver/COPYING_GPL.txt b/usb/driver/COPYING_GPL.txt
old mode 100755
new mode 100644
diff --git a/usb/driver/LICENSE.txt b/usb/driver/LICENSE.txt
old mode 100755
new mode 100644
diff --git a/usb/driver/Makefile b/usb/driver/Makefile
old mode 100755
new mode 100644
diff --git a/usb/driver/README.txt b/usb/driver/README.txt
old mode 100755
new mode 100644
diff --git a/usb/driver/abort_endpoint.c b/usb/driver/abort_endpoint.c
old mode 100755
new mode 100644
diff --git a/usb/driver/claim_interface.c b/usb/driver/claim_interface.c
old mode 100755
new mode 100644
diff --git a/usb/driver/clear_feature.c b/usb/driver/clear_feature.c
old mode 100755
new mode 100644
diff --git a/usb/driver/dispatch.c b/usb/driver/dispatch.c
old mode 100755
new mode 100644
diff --git a/usb/driver/driver_api.h b/usb/driver/driver_api.h
old mode 100755
new mode 100644
diff --git a/usb/driver/driver_debug.c b/usb/driver/driver_debug.c
old mode 100755
new mode 100644
diff --git a/usb/driver/driver_debug.h b/usb/driver/driver_debug.h
old mode 100755
new mode 100644
diff --git a/usb/driver/driver_registry.c b/usb/driver/driver_registry.c
old mode 100755
new mode 100644
diff --git a/usb/driver/get_configuration.c b/usb/driver/get_configuration.c
old mode 100755
new mode 100644
diff --git a/usb/driver/get_descriptor.c b/usb/driver/get_descriptor.c
old mode 100755
new mode 100644
diff --git a/usb/driver/get_interface.c b/usb/driver/get_interface.c
old mode 100755
new mode 100644
diff --git a/usb/driver/get_status.c b/usb/driver/get_status.c
old mode 100755
new mode 100644
diff --git a/usb/driver/ioctl.c b/usb/driver/ioctl.c
old mode 100755
new mode 100644
diff --git a/usb/driver/libusb-win32-README-1.2.6.0.txt b/usb/driver/libusb-win32-README-1.2.6.0.txt
old mode 100755
new mode 100644
diff --git a/usb/driver/libusb_driver.c b/usb/driver/libusb_driver.c
old mode 100755
new mode 100644
diff --git a/usb/driver/libusb_driver.h b/usb/driver/libusb_driver.h
old mode 100755
new mode 100644
diff --git a/usb/driver/libusb_driver_rc.rc b/usb/driver/libusb_driver_rc.rc
old mode 100755
new mode 100644
diff --git a/usb/driver/lusb_defdi_guids.h b/usb/driver/lusb_defdi_guids.h
old mode 100755
new mode 100644
diff --git a/usb/driver/pnp.c b/usb/driver/pnp.c
old mode 100755
new mode 100644
diff --git a/usb/driver/power.c b/usb/driver/power.c
old mode 100755
new mode 100644
diff --git a/usb/driver/release_interface.c b/usb/driver/release_interface.c
old mode 100755
new mode 100644
diff --git a/usb/driver/reset_device.c b/usb/driver/reset_device.c
old mode 100755
new mode 100644
diff --git a/usb/driver/reset_endpoint.c b/usb/driver/reset_endpoint.c
old mode 100755
new mode 100644
diff --git a/usb/driver/set_configuration.c b/usb/driver/set_configuration.c
old mode 100755
new mode 100644
diff --git a/usb/driver/set_descriptor.c b/usb/driver/set_descriptor.c
old mode 100755
new mode 100644
diff --git a/usb/driver/set_feature.c b/usb/driver/set_feature.c
old mode 100755
new mode 100644
diff --git a/usb/driver/set_interface.c b/usb/driver/set_interface.c
old mode 100755
new mode 100644
diff --git a/usb/driver/transfer.c b/usb/driver/transfer.c
old mode 100755
new mode 100644
diff --git a/usb/driver/usbd.def b/usb/driver/usbd.def
old mode 100755
new mode 100644
diff --git a/usb/driver/usbdlib_gcc.h b/usb/driver/usbdlib_gcc.h
old mode 100755
new mode 100644
diff --git a/usb/driver/vendor_request.c b/usb/driver/vendor_request.c
old mode 100755
new mode 100644
diff --git a/usb/install_kext.sh b/usb/install_kext.sh
old mode 100755
new mode 100644
diff --git a/xicc/Jamfile b/xicc/Jamfile
old mode 100755
new mode 100644
diff --git a/xicc/License.txt b/xicc/License.txt
old mode 100755
new mode 100644
diff --git a/xicc/Readme.txt b/xicc/Readme.txt
old mode 100755
new mode 100644
diff --git a/xicc/afiles b/xicc/afiles
old mode 100755
new mode 100644
diff --git a/xicc/bt1886.c b/xicc/bt1886.c
old mode 100755
new mode 100644
diff --git a/xicc/bt1886.h b/xicc/bt1886.h
old mode 100755
new mode 100644
diff --git a/xicc/cam02.c b/xicc/cam02.c
old mode 100755
new mode 100644
diff --git a/xicc/cam02.h b/xicc/cam02.h
old mode 100755
new mode 100644
diff --git a/xicc/cam02plot.c b/xicc/cam02plot.c
old mode 100755
new mode 100644
diff --git a/xicc/cam02ref.h b/xicc/cam02ref.h
old mode 100755
new mode 100644
diff --git a/xicc/cam02test.c b/xicc/cam02test.c
old mode 100755
new mode 100644
diff --git a/xicc/cam97s3.c b/xicc/cam97s3.c
old mode 100755
new mode 100644
diff --git a/xicc/cam97s3.h b/xicc/cam97s3.h
old mode 100755
new mode 100644
diff --git a/xicc/cam97test.c b/xicc/cam97test.c
old mode 100755
new mode 100644
diff --git a/xicc/ccmx.c b/xicc/ccmx.c
old mode 100755
new mode 100644
diff --git a/xicc/ccmx.h b/xicc/ccmx.h
old mode 100755
new mode 100644
diff --git a/xicc/ccss.c b/xicc/ccss.c
old mode 100755
new mode 100644
diff --git a/xicc/ccss.h b/xicc/ccss.h
old mode 100755
new mode 100644
diff --git a/xicc/ccttest.c b/xicc/ccttest.c
old mode 100755
new mode 100644
diff --git a/xicc/cgatsplot.c b/xicc/cgatsplot.c
old mode 100755
new mode 100644
diff --git a/xicc/cv.c b/xicc/cv.c
old mode 100755
new mode 100644
diff --git a/xicc/cvtest.c b/xicc/cvtest.c
old mode 100755
new mode 100644
diff --git a/xicc/example.sp b/xicc/example.sp
old mode 100755
new mode 100644
diff --git a/xicc/extracticc.c b/xicc/extracticc.c
old mode 100755
new mode 100644
diff --git a/xicc/extractttag.c b/xicc/extractttag.c
old mode 100755
new mode 100644
diff --git a/xicc/fakeCMY.c b/xicc/fakeCMY.c
old mode 100755
new mode 100644
diff --git a/xicc/fbview.c b/xicc/fbview.c
old mode 100755
new mode 100644
diff --git a/xicc/iccgamut.c b/xicc/iccgamut.c
old mode 100755
new mode 100644
diff --git a/xicc/iccjpeg.c b/xicc/iccjpeg.c
old mode 100755
new mode 100644
diff --git a/xicc/iccjpeg.h b/xicc/iccjpeg.h
old mode 100755
new mode 100644
diff --git a/xicc/icheck.c b/xicc/icheck.c
old mode 100755
new mode 100644
diff --git a/xicc/monctest.c b/xicc/monctest.c
old mode 100755
new mode 100644
diff --git a/xicc/moncurve.c b/xicc/moncurve.c
old mode 100755
new mode 100644
diff --git a/xicc/moncurve.h b/xicc/moncurve.h
old mode 100755
new mode 100644
diff --git a/xicc/mpp.c b/xicc/mpp.c
old mode 100755
new mode 100644
diff --git a/xicc/mpp.h b/xicc/mpp.h
old mode 100755
new mode 100644
diff --git a/xicc/mpplu.c b/xicc/mpplu.c
old mode 100755
new mode 100644
diff --git a/xicc/revfix.c b/xicc/revfix.c
old mode 100755
new mode 100644
diff --git a/xicc/specplot.c b/xicc/specplot.c
old mode 100755
new mode 100644
diff --git a/xicc/specsubsamp.c b/xicc/specsubsamp.c
old mode 100755
new mode 100644
diff --git a/xicc/spectest.c b/xicc/spectest.c
old mode 100755
new mode 100644
diff --git a/xicc/spectest2.c b/xicc/spectest2.c
old mode 100755
new mode 100644
diff --git a/xicc/tiffgamut.c b/xicc/tiffgamut.c
old mode 100755
new mode 100644
diff --git a/xicc/tiffgmts.c b/xicc/tiffgmts.c
old mode 100755
new mode 100644
diff --git a/xicc/transplot.c b/xicc/transplot.c
old mode 100755
new mode 100644
diff --git a/xicc/xcal.c b/xicc/xcal.c
old mode 100755
new mode 100644
diff --git a/xicc/xcal.h b/xicc/xcal.h
old mode 100755
new mode 100644
diff --git a/xicc/xcam.c b/xicc/xcam.c
old mode 100755
new mode 100644
diff --git a/xicc/xcam.h b/xicc/xcam.h
old mode 100755
new mode 100644
diff --git a/xicc/xcolorants.c b/xicc/xcolorants.c
old mode 100755
new mode 100644
diff --git a/xicc/xcolorants.h b/xicc/xcolorants.h
old mode 100755
new mode 100644
diff --git a/xicc/xcolorantslu.c b/xicc/xcolorantslu.c
old mode 100755
new mode 100644
diff --git a/xicc/xdevlin.c b/xicc/xdevlin.c
old mode 100755
new mode 100644
diff --git a/xicc/xdevlin.h b/xicc/xdevlin.h
old mode 100755
new mode 100644
diff --git a/xicc/xdgb.c b/xicc/xdgb.c
old mode 100755
new mode 100644
diff --git a/xicc/xdgb.h b/xicc/xdgb.h
old mode 100755
new mode 100644
diff --git a/xicc/xfbview.c b/xicc/xfbview.c
old mode 100755
new mode 100644
diff --git a/xicc/xfit.c b/xicc/xfit.c
old mode 100755
new mode 100644
diff --git a/xicc/xfit.h b/xicc/xfit.h
old mode 100755
new mode 100644
diff --git a/xicc/xicc.c b/xicc/xicc.c
old mode 100755
new mode 100644
diff --git a/xicc/xicc.h b/xicc/xicc.h
old mode 100755
new mode 100644
diff --git a/xicc/xicclu.c b/xicc/xicclu.c
old mode 100755
new mode 100644
diff --git a/xicc/xlut.c b/xicc/xlut.c
old mode 100755
new mode 100644
index 8b7699c..827dde8
--- a/xicc/xlut.c
+++ b/xicc/xlut.c
@@ -46,6 +46,10 @@
Should xlutfix.c be revived (also adding ICM_CLUT_SET_APXLS support),
to improve "bumpy black" problem ?
+
+ Would be nice to be able to specify a specific patch
+ as the white one rather than using heuristic to identify it,
+ since some pathalogical cases don't work.
*/
/*
diff --git a/xicc/xlutfix.c b/xicc/xlutfix.c
old mode 100755
new mode 100644
diff --git a/xicc/xmatrix.c b/xicc/xmatrix.c
old mode 100755
new mode 100644
index 034a396..3d4fca6
--- a/xicc/xmatrix.c
+++ b/xicc/xmatrix.c
@@ -32,6 +32,9 @@
* normalized back to zero by scaling the matrix before storing
* the result in the ICC profile.
*
+ * Would be nice to be able to specify a specific patch
+ * as the white one rather than using heuristic to identify it,
+ * since some pathalogical cases don't work.
*/
diff --git a/xicc/xmono.c b/xicc/xmono.c
old mode 100755
new mode 100644
diff --git a/xicc/xspect.c b/xicc/xspect.c
old mode 100755
new mode 100644
index 1df8555..6738113
--- a/xicc/xspect.c
+++ b/xicc/xspect.c
@@ -3197,7 +3197,7 @@ static xspect CIE1995_TCS[] = {
0.44, 0.44, 0.45, 0.45, 0.45
}
},
- /* TCS15 1 YR 6/4 Asian skin */
+ /* TCS15 1 YR 6/4 Asian skin - JIS standard */
{
95, 360.0, 830.0, /* 95 bands from 360 to 830 nm in 5nm steps */
1.0, /* Scale factor */
diff --git a/xicc/xspect.h b/xicc/xspect.h
old mode 100755
new mode 100644
diff --git a/xicc/xutils.c b/xicc/xutils.c
old mode 100755
new mode 100644
diff --git a/xicc/xutils.h b/xicc/xutils.h
old mode 100755
new mode 100644
diff --git a/xml/ANNOUNCEMENT b/xml/ANNOUNCEMENT
old mode 100755
new mode 100644
diff --git a/xml/CHANGES b/xml/CHANGES
old mode 100755
new mode 100644
diff --git a/xml/COPYING b/xml/COPYING
old mode 100755
new mode 100644
diff --git a/xml/Makefile.in b/xml/Makefile.in
old mode 100755
new mode 100644
diff --git a/xml/README b/xml/README
old mode 100755
new mode 100644
diff --git a/xml/afiles b/xml/afiles
old mode 100755
new mode 100644
diff --git a/xml/config.h.in b/xml/config.h.in
old mode 100755
new mode 100644
diff --git a/xml/configure b/xml/configure
old mode 100755
new mode 100644
diff --git a/xml/configure.in b/xml/configure.in
old mode 100755
new mode 100644
diff --git a/xml/doc/Mini-XML.pdf b/xml/doc/Mini-XML.pdf
old mode 100755
new mode 100644
diff --git a/xml/install-sh b/xml/install-sh
old mode 100755
new mode 100644
diff --git a/xml/mxml-attr.c b/xml/mxml-attr.c
old mode 100755
new mode 100644
diff --git a/xml/mxml-config.h b/xml/mxml-config.h
old mode 100755
new mode 100644
diff --git a/xml/mxml-entity.c b/xml/mxml-entity.c
old mode 100755
new mode 100644
diff --git a/xml/mxml-file.c b/xml/mxml-file.c
old mode 100755
new mode 100644
diff --git a/xml/mxml-get.c b/xml/mxml-get.c
old mode 100755
new mode 100644
diff --git a/xml/mxml-index.c b/xml/mxml-index.c
old mode 100755
new mode 100644
diff --git a/xml/mxml-node.c b/xml/mxml-node.c
old mode 100755
new mode 100644
diff --git a/xml/mxml-private.c b/xml/mxml-private.c
old mode 100755
new mode 100644
diff --git a/xml/mxml-private.h b/xml/mxml-private.h
old mode 100755
new mode 100644
diff --git a/xml/mxml-search.c b/xml/mxml-search.c
old mode 100755
new mode 100644
diff --git a/xml/mxml-set.c b/xml/mxml-set.c
old mode 100755
new mode 100644
diff --git a/xml/mxml-string.c b/xml/mxml-string.c
old mode 100755
new mode 100644
diff --git a/xml/mxml.h b/xml/mxml.h
old mode 100755
new mode 100644
diff --git a/xml/mxml.list.in b/xml/mxml.list.in
old mode 100755
new mode 100644
diff --git a/xml/mxml.pc.in b/xml/mxml.pc.in
old mode 100755
new mode 100644
diff --git a/xml/mxml.spec b/xml/mxml.spec
old mode 100755
new mode 100644
diff --git a/xml/mxml.xml b/xml/mxml.xml
old mode 100755
new mode 100644
diff --git a/xml/mxmldoc.c b/xml/mxmldoc.c
old mode 100755
new mode 100644
diff --git a/xml/test.xml b/xml/test.xml
old mode 100755
new mode 100644
diff --git a/xml/testmxml.c b/xml/testmxml.c
old mode 100755
new mode 100644
diff --git a/yajl/COPYING b/yajl/COPYING
old mode 100755
new mode 100644
diff --git a/yajl/ChangeLog b/yajl/ChangeLog
old mode 100755
new mode 100644
diff --git a/yajl/Jamfile b/yajl/Jamfile
old mode 100755
new mode 100644
diff --git a/yajl/README b/yajl/README
old mode 100755
new mode 100644
diff --git a/yajl/TODO b/yajl/TODO
old mode 100755
new mode 100644
diff --git a/yajl/afiles b/yajl/afiles
old mode 100755
new mode 100644
diff --git a/yajl/json_verify.c b/yajl/json_verify.c
old mode 100755
new mode 100644
diff --git a/yajl/yajl.c b/yajl/yajl.c
old mode 100755
new mode 100644
diff --git a/yajl/yajl.h b/yajl/yajl.h
old mode 100755
new mode 100644
diff --git a/yajl/yajl_alloc.c b/yajl/yajl_alloc.c
old mode 100755
new mode 100644
diff --git a/yajl/yajl_alloc.h b/yajl/yajl_alloc.h
old mode 100755
new mode 100644
diff --git a/yajl/yajl_buf.c b/yajl/yajl_buf.c
old mode 100755
new mode 100644
diff --git a/yajl/yajl_buf.h b/yajl/yajl_buf.h
old mode 100755
new mode 100644
diff --git a/yajl/yajl_bytestack.h b/yajl/yajl_bytestack.h
old mode 100755
new mode 100644
diff --git a/yajl/yajl_common.h b/yajl/yajl_common.h
old mode 100755
new mode 100644
diff --git a/yajl/yajl_encode.c b/yajl/yajl_encode.c
old mode 100755
new mode 100644
diff --git a/yajl/yajl_encode.h b/yajl/yajl_encode.h
old mode 100755
new mode 100644
diff --git a/yajl/yajl_gen.c b/yajl/yajl_gen.c
old mode 100755
new mode 100644
diff --git a/yajl/yajl_gen.h b/yajl/yajl_gen.h
old mode 100755
new mode 100644
diff --git a/yajl/yajl_lex.c b/yajl/yajl_lex.c
old mode 100755
new mode 100644
diff --git a/yajl/yajl_lex.h b/yajl/yajl_lex.h
old mode 100755
new mode 100644
diff --git a/yajl/yajl_parse.h b/yajl/yajl_parse.h
old mode 100755
new mode 100644
diff --git a/yajl/yajl_parser.c b/yajl/yajl_parser.c
old mode 100755
new mode 100644
diff --git a/yajl/yajl_parser.h b/yajl/yajl_parser.h
old mode 100755
new mode 100644
diff --git a/yajl/yajl_test.c b/yajl/yajl_test.c
old mode 100755
new mode 100644
diff --git a/yajl/yajl_tree.c b/yajl/yajl_tree.c
old mode 100755
new mode 100644
diff --git a/yajl/yajl_tree.h b/yajl/yajl_tree.h
old mode 100755
new mode 100644
diff --git a/yajl/yajl_version.c b/yajl/yajl_version.c
old mode 100755
new mode 100644
diff --git a/yajl/yajl_version.h b/yajl/yajl_version.h
old mode 100755
new mode 100644
diff --git a/ziparch.sh b/ziparch.sh
old mode 100755
new mode 100644
index 44f3382..0cecba5
--- a/ziparch.sh
+++ b/ziparch.sh
@@ -52,7 +52,8 @@ do
cd _zipdir
zip -9 -m ../argyll.zip `cat ../_ziplist`
cd ..
- if ! expr ${i} : '\b\.\b' > /dev/null ; then
+ #if ! expr ${i} : '\b\.\b' > /dev/null ; then
+ if ! expr ${i} : '\.' > /dev/null ; then
rm -r _zipdir/${i}
fi
fi
@@ -87,7 +88,8 @@ do
cd _zipdir
zip -9 -m ../argyll.zip `cat ../_ziplist`
cd ..
- if ! expr ${i} : '\b\.\b' > /dev/null ; then
+ #if ! expr ${i} : '\b\.\b' > /dev/null ; then
+ if ! expr ${i} : '\.' > /dev/null ; then
rm -r _zipdir/${i}
fi
fi
--
cgit v1.2.3