summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.gitignore3
-rw-r--r--debian/changelog4
-rw-r--r--debian/patches/0100_spelling.patch912
-rw-r--r--spectro/linear.cal272
-rw-r--r--spectro/strange.cal272
5 files changed, 914 insertions, 549 deletions
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..6c270cd
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,3 @@
+.bzr
+.bzrignore
+.pc \ No newline at end of file
diff --git a/debian/changelog b/debian/changelog
index 62ef403..ff449fa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-argyll (1.9.1+repack-1) UNRELEASED; urgency=medium
+argyll (1.9.1+repack-1) unstable; urgency=medium
* New upstream release.
- Refresh patches.
@@ -15,7 +15,7 @@ argyll (1.9.1+repack-1) UNRELEASED; urgency=medium
* debian/watch:
- Bump Version to 4 (no changes required).
- -- Jörg Frings-Fürst <debian@jff-webhosting.net> Sun, 02 Oct 2016 19:26:51 +0200
+ -- Jörg Frings-Fürst <debian@jff-webhosting.net> Tue, 11 Oct 2016 00:26:31 +0200
argyll (1.8.3+repack-2) unstable; urgency=medium
diff --git a/debian/patches/0100_spelling.patch b/debian/patches/0100_spelling.patch
index 3dc0de8..941deb4 100644
--- a/debian/patches/0100_spelling.patch
+++ b/debian/patches/0100_spelling.patch
@@ -1,6 +1,6 @@
Description: correct some typos
Author: Jörg Frings-Fürst <debian@jff-webhosting.net>
-Last-Update: 2015-09-30
+Last-Update: 2016-10-11
---
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
Index: trunk/spectro/dispcal.c
@@ -108,7 +108,7 @@ Index: trunk/spectro/spotread.c
if (na[0] == 'n' || na[0] == 'N')
fe = inst_opt_filter_none;
else if (na[0] == 'p' || na[0] == 'P')
-@@ -708,7 +708,7 @@ int main(int argc, char *argv[]) {
+@@ -708,13 +708,13 @@ int main(int argc, char *argv[]) {
/* Extra filter compensation file */
} else if (argv[fa][1] == 'E') {
fa = nfa;
@@ -117,6 +117,31 @@ Index: trunk/spectro/spotread.c
strncpy(filtername,na,MAXNAMEL-1); filtername[MAXNAMEL-1] = '\000';
/* XRGA conversion */
+ } else if (argv[fa][1] == 'A') {
+ fa = nfa;
+- if (na == NULL) usage("Paramater expected following -A");
++ if (na == NULL) usage("Parameter expected following -A");
+ if (na[0] == 'N')
+ calstd = xcalstd_none;
+ else if (na[0] == 'A')
+@@ -724,7 +724,7 @@ int main(int argc, char *argv[]) {
+ else if (na[0] == 'G')
+ calstd = xcalstd_gmdi;
+ else
+- usage("Paramater after -A '%c' not recognized",na[0]);
++ usage("Parameter after -A '%c' not recognized",na[0]);
+
+ /* Show Yxy */
+ } else if (argv[fa][1] == 'x') {
+@@ -1432,7 +1432,7 @@ int main(int argc, char *argv[]) {
+
+ /* Or something is wrong with instrument capabilities */
+ } else {
+- printf("\nNo reasonable trigger mode avilable for this instrument\n");
++ printf("\nNo reasonable trigger mode available for this instrument\n");
+ it->del(it);
+ return -1;
+ }
Index: trunk/spectro/colorhug.c
===================================================================
--- trunk.orig/spectro/colorhug.c
@@ -143,6 +168,15 @@ Index: trunk/spectro/dispwin.c
/* 2 if profile not found */
int dispwin_uninstall_profile(dispwin *p, char *fname, p_scope scope) {
debugr2((errout,"dispwin_uninstall_profile '%s'\n", fname));
+@@ -5038,7 +5038,7 @@ int ddebug /* >0 to print debug sta
+ vinfo = XGetVisualInfo(p->mydisplay, VisualIDMask, &template, &nitems);
+
+ if (nitems < 1) {
+- debugr2((errout,"new_dispwin: Failed to get XGetVisualInfo of defalt Visual\n"));
++ debugr2((errout,"new_dispwin: Failed to get XGetVisualInfo of default Visual\n"));
+ dispwin_del(p);
+ return NULL;
+ }
@@ -5630,7 +5630,7 @@ int ddebug /* >0 to print debug sta
p->native = native &= ~2;
}
@@ -161,7 +195,7 @@ Index: trunk/spectro/dtp51.c
return "Invalid step";
case DTP51_NO_DATA_AVAILABLE:
- return "No data availble";
-+ return "No data avaialble";
++ return "No data available";
case DTP51_LAMP_MARGINAL:
return "Lamp marginal";
case DTP51_LAMP_FAILURE:
@@ -169,6 +203,24 @@ Index: trunk/spectro/dtp92.c
===================================================================
--- trunk.orig/spectro/dtp92.c
+++ trunk/spectro/dtp92.c
+@@ -357,7 +357,7 @@ dtp92_init_coms(inst *pp, baud_rate br,
+ if ((ev = dtp92_command(p, tbuf, buf, MAX_MES_SIZE, 6.0)) != inst_ok)
+ error("Writing offset drift value failed");
+ else
+- printf("Writing offset drift value suceeded!\n");
++ printf("Writing offset drift value succeeded!\n");
+ } else {
+ printf("No command written\n");
+ }
+@@ -371,7 +371,7 @@ dtp92_init_coms(inst *pp, baud_rate br,
+ return inst_coms_fail;
+ }
+
+- a1logd(p->log, 2, "dtp92_init_coms: init coms has suceeded\n");
++ a1logd(p->log, 2, "dtp92_init_coms: init coms has succeeded\n");
+
+ p->gotcoms = 1;
+ return inst_ok;
@@ -941,7 +941,7 @@ dtp92_interp_error(inst *pp, int ec) {
case DTP92_NO_DATA_AVAILABLE:
return "No data available";
@@ -208,6 +260,24 @@ Index: trunk/spectro/i1pro_imp.c
===================================================================
--- trunk.orig/spectro/i1pro_imp.c
+++ trunk/spectro/i1pro_imp.c
+@@ -2700,7 +2700,7 @@ int *pinstmsec) { /* Return instrument l
+ break;
+ }
+
+- a1logd(p->log, 2, "i1pro_meas_delay: stoped at sample %d time %f\n",i,samp[i].sec);
++ a1logd(p->log, 2, "i1pro_meas_delay: stopped at sample %d time %f\n",i,samp[i].sec);
+
+ /* Compute overall delay */
+ dispmsec = (int)(samp[i].sec * 1000.0 + 0.5); /* Display update time */
+@@ -3815,7 +3815,7 @@ i1pro_code i1pro_imp_meas_refrate(
+ }
+ }
+ } else {
+- a1logd(p->log, 3, "Not enough tries suceeded to determine refresh rate\n");
++ a1logd(p->log, 3, "Not enough tries succeeded to determine refresh rate\n");
+ }
+
+ return I1PRO_RD_NOREFR_FOUND;
@@ -3910,7 +3910,7 @@ i1pro_code i1pro_restore_refspot_cal(i1p
return I1PRO_OK;
}
@@ -243,6 +313,24 @@ Index: trunk/spectro/ss.c
===================================================================
--- trunk.orig/spectro/ss.c
+++ trunk/spectro/ss.c
+@@ -374,7 +374,7 @@ ss_init_coms(inst *pp, baud_rate br, flo
+
+ p->gotcoms = 1;
+
+- a1logd(p->log, 2, "ss_init_coms: init coms has suceeded\n");
++ a1logd(p->log, 2, "ss_init_coms: init coms has succeeded\n");
+
+ return inst_ok;
+ }
+@@ -1743,7 +1743,7 @@ ss_interp_error(inst *pp, int ec) {
+ case ss_et_FilterOutOfPos:
+ return "Filter wheel out of position";
+ case ss_et_SendTimeout:
+- return "Data transmission timout";
++ return "Data transmission timeout";
+ case ss_et_DriveError:
+ return "Data drive defect";
+ case ss_et_MeasDisabled:
@@ -1863,7 +1863,7 @@ ss_interp_error(inst *pp, int ec) {
case ss_et_BadHexEncoding:
return "Message received from instrument has bad Hex encoding";
@@ -348,6 +436,24 @@ Index: trunk/spectro/munki_imp.c
===================================================================
--- trunk.orig/spectro/munki_imp.c
+++ trunk/spectro/munki_imp.c
+@@ -1904,7 +1904,7 @@ int *pinstmsec) { /* Return instrumen
+ break;
+ }
+
+- a1logd(p->log, 2, "munki_meas_delay: stoped at sample %d time %f\n",i,samp[i].sec);
++ a1logd(p->log, 2, "munki_meas_delay: stopped at sample %d time %f\n",i,samp[i].sec);
+
+ /* Compute overall delay and subtract patch change delay */
+ dispmsec = (int)(samp[i].sec * 1000.0 + 0.5);
+@@ -3046,7 +3046,7 @@ munki_code munki_imp_meas_refrate(
+ }
+ }
+ } else {
+- a1logd(p->log, 3, "Not enough tries suceeded to determine refresh rate\n");
++ a1logd(p->log, 3, "Not enough tries succeeded to determine refresh rate\n");
+ }
+
+ return MUNKI_RD_NOREFR_FOUND;
@@ -6425,7 +6425,7 @@ munki_code munki_create_hr(munki *p, int
int i, j, jj, k, cx, sx;
munki_fc coeff[40][16]; /* Existing filter cooefficients */
@@ -357,10 +463,100 @@ Index: trunk/spectro/munki_imp.c
double wl_step1;
munki_xp xp[41]; /* Crossover points each side of filter */
munki_code ev = MUNKI_OK;
+@@ -8733,7 +8733,7 @@ munki_readmeasurement(
+
+ top = extra + m->c_inttime * nmeas;
+
+- a1logd(p->log,2,"munki_readmeasurement: inummeas %d, scanflag %d, address %p bsize 0x%x, timout %f\n",inummeas, scanflag, buf, bsize, top);
++ a1logd(p->log,2,"munki_readmeasurement: inummeas %d, scanflag %d, address %p bsize 0x%x, timeout %f\n",inummeas, scanflag, buf, bsize, top);
+
+ for (;;) {
+ int size; /* number of bytes to read */
Index: trunk/target/printtarg.c
===================================================================
--- trunk.orig/target/printtarg.c
+++ trunk/target/printtarg.c
+@@ -345,7 +345,7 @@ static void ps_setcolor(trend *ss, xcal
+ } else if (c->altrep == 6) { /* DeviceN */
+ gen_ncolor(s, c);
+ } else {
+- error("Device white encoding not approproate!");
++ error("Device white encoding not appropriate!");
+ }
+
+ } else if (c->nmask == ICX_K) {
+@@ -362,7 +362,7 @@ static void ps_setcolor(trend *ss, xcal
+ } else if (c->altrep == 3) { /* DeviceN */
+ gen_ncolor(s, c);
+ } else {
+- error("Device black encoding not approproate!");
++ error("Device black encoding not appropriate!");
+ }
+
+ } else if (c->nmask == ICX_CMY) {
+@@ -377,7 +377,7 @@ static void ps_setcolor(trend *ss, xcal
+ } else if (c->altrep == 8) { /* DeviceN */
+ gen_ncolor(s, c);
+ } else {
+- error("Device CMY encoding not approproate!");
++ error("Device CMY encoding not appropriate!");
+ }
+
+ } else if (c->nmask == ICX_RGB || c->nmask == ICX_IRGB) {
+@@ -749,7 +749,7 @@ static void tiff_setcolor(trend *ss, xca
+ } else if (c->altrep == 6) { /* DeviceN single channel */
+ s->c[0] = cdev[0];
+ } else {
+- error("Device white encoding not approproate!");
++ error("Device white encoding not appropriate!");
+ }
+
+ } else if (c->nmask == ICX_K) {
+@@ -765,7 +765,7 @@ static void tiff_setcolor(trend *ss, xca
+ } else if (c->altrep == 3) { /* DeviceN single channel */
+ s->c[0] = cdev[0];
+ } else {
+- error("Device black encoding not approproate!");
++ error("Device black encoding not appropriate!");
+ }
+
+ } else if (c->nmask == ICX_CMY) {
+@@ -783,7 +783,7 @@ static void tiff_setcolor(trend *ss, xca
+ s->c[1] = cdev[1];
+ s->c[2] = cdev[2];
+ } else {
+- error("Device CMY encoding not approproate!");
++ error("Device CMY encoding not appropriate!");
+ }
+
+ } else {
+@@ -968,7 +968,7 @@ static trend *new_tiff_trend(
+ nc = icx_noofinks(nmask);
+ nc = 1;
+ } else {
+- error("Device white encoding not approproate");
++ error("Device white encoding not appropriate");
+ }
+
+ } else if (nmask == ICX_K) {
+@@ -984,7 +984,7 @@ static trend *new_tiff_trend(
+ nc = icx_noofinks(nmask);
+ nc = 1;
+ } else {
+- error("Device black encoding not approproate");
++ error("Device black encoding not appropriate");
+ }
+
+ } else if (nmask == ICX_RGB || nmask == ICX_IRGB) {
+@@ -1002,7 +1002,7 @@ static trend *new_tiff_trend(
+ csp = ncol_2d;
+ nc = icx_noofinks(nmask);
+ } else {
+- error("Device CMY encoding not approproate");
++ error("Device CMY encoding not appropriate");
+ }
+
+ } else if (nmask == ICX_CMYK) {
@@ -2209,7 +2209,7 @@ int *p_npat /* Return number of patche
@@ -370,6 +566,15 @@ Index: trunk/target/printtarg.c
}
/* Compute page limits */
+@@ -2255,7 +2255,7 @@ int *p_npat /* Return number of patche
+ tidpad = (pprow - tidminp)/2; /* Center TID */
+
+ if (pprow < (1+nextrap))
+- error("Paper size not long enought for a single patch per row!");
++ error("Paper size not long enough for a single patch per row!");
+
+ *ptpprow = tpprow = pprow - nextrap; /* Test sample patches per row */
+
@@ -2953,7 +2953,7 @@ char *argv[];
double sscale = 1.0; /* Spacer size scale */
int rand = 1;
@@ -453,6 +658,15 @@ Index: trunk/link/collink.c
/* output, copy it into locus[], which will be given to the inverse */
/* lookup function, else the inverse lookup will generate a K using */
/* the curve parameters. */
+@@ -1192,7 +1192,7 @@ void devip_devop(void *cntx, double *out
+ if (p->verb)
+ #endif
+ {
+- printf("White point hack mapped %f %f %f to %f %f %f, hit withing %f\n",
++ printf("White point hack mapped %f %f %f to %f %f %f, hit within %f\n",
+ p->in.wp[0],p->in.wp[1],p->in.wp[2],pcsv[0], pcsv[1], pcsv[2],dd);
+ fflush(stdout);
+ }
@@ -1242,7 +1242,7 @@ void devip_devop(void *cntx, double *out
if (p->nhack == 2) {
/* Ideally we would create a 4D PCSK -> PCSK gamut mapping */
@@ -462,6 +676,15 @@ Index: trunk/link/collink.c
/* In practice we're going to simply interpolated between */
/* two extremes: unrestricted gamut and K only black gamut. */
double map0[3], map1[3];
+@@ -4737,7 +4737,7 @@ main(int argc, char *argv[]) {
+ }
+
+ if (li.verb)
+- printf("Finished verfication\n");
++ printf("Finished verification\n");
+
+ printf("Average error = %f%%, peak error = %f%%\n",aerr * 100.0/nerr, perr * 100.0);
+ printf("Input %f %f %f %f\n",pin[0], pin[1], pin[2], pin[3]);
Index: trunk/profile/printcal.c
===================================================================
--- trunk.orig/profile/printcal.c
@@ -488,6 +711,24 @@ Index: trunk/spectro/dispsup.c
val.XYZ[0], val.XYZ[1], val.XYZ[2]);
scb->mtype = val.mtype;
+@@ -1239,7 +1239,7 @@ int disprd_ambient(
+
+ /* Or something is wrong with instrument capabilities */
+ } else {
+- printf("No reasonable trigger mode avilable for this instrument\n");
++ printf("No reasonable trigger mode available for this instrument\n");
+ return 2;
+ }
+
+@@ -2342,7 +2342,7 @@ static int config_inst_displ(disprd *p)
+ /* Reset key meanings */
+ inst_reset_uih();
+
+- a1logd(p->log,1,"config_inst_displ suceeded\n");
++ a1logd(p->log,1,"config_inst_displ succeeded\n");
+ return 0;
+ }
+
Index: trunk/gamut/gammap.c
===================================================================
--- trunk.orig/gamut/gammap.c
@@ -571,6 +812,15 @@ Index: trunk/spectro/ccxxmake.c
printf("\n");
+@@ -803,7 +803,7 @@ int main(int argc, char *argv[]) {
+ refs[i][2] = cols[i][2];
+ }
+ gotref = 1;
+- warning("Got two colorimetric files - assuming '%s' is the refrence",innames[0]);
++ warning("Got two colorimetric files - assuming '%s' is the reference",innames[0]);
+ refrmode = -1;
+ cbid = 0;
+
Index: trunk/spectro/dispread.c
===================================================================
--- trunk.orig/spectro/dispread.c
@@ -606,6 +856,39 @@ Index: trunk/spectro/fakeread.c
if (bt1886 == 1) { /* Using effective gamma */
if (verb)
+@@ -980,7 +980,7 @@ int main(int argc, char *argv[])
+ else if (nmask == ICX_K && sep_ins == icSigCmykData)
+ gfudge = 2;
+ else if (icx_colorant_comb_match_icc(nmask, sep_ins) == 0) {
+- error("Separation ICC device space '%s' dosen't match TI1 '%s'",
++ error("Separation ICC device space '%s' doesn't match TI1 '%s'",
+ icm2str(icmColorSpaceSignature, sep_ins),
+ ident); /* Should free(). */
+ }
+@@ -989,7 +989,7 @@ int main(int argc, char *argv[])
+ if (icc_luo != NULL) {
+ /* Check if icc is compatible with .ti1 */
+ if (sep_outs != ins)
+- error("ICC device space '%s' dosen't match Separation ICC '%s'",
++ error("ICC device space '%s' doesn't match Separation ICC '%s'",
+ icm2str(icmColorSpaceSignature, ins),
+ icm2str(icmColorSpaceSignature, sep_outs));
+ } else if (mlu != NULL) {
+@@ -1014,12 +1014,12 @@ int main(int argc, char *argv[])
+ else {
+ if (!revlookup) {
+ if (icx_colorant_comb_match_icc(nmask, ins) == 0)
+- error("ICC device space '%s' dosen't match TI1 '%s'",
++ error("ICC device space '%s' doesn't match TI1 '%s'",
+ icm2str(icmColorSpaceSignature, ins),
+ ident); // Should free().
+ } else {
+ if (icx_colorant_comb_match_icc(nmask, outs) == 0)
+- error("ICC device space '%s' dosen't match TI1 '%s'",
++ error("ICC device space '%s' doesn't match TI1 '%s'",
+ icm2str(icmColorSpaceSignature, ins),
+ ident); // Should free().
+
Index: trunk/profile/invprofcheck.c
===================================================================
--- trunk.orig/profile/invprofcheck.c
@@ -662,6 +945,15 @@ Index: trunk/spectro/ex1.c
===================================================================
--- trunk.orig/spectro/ex1.c
+++ trunk/spectro/ex1.c
+@@ -188,7 +188,7 @@ ex1_init_coms(inst *pp, baud_rate br, fl
+
+ p->gotcoms = 1;
+
+- a1logd(p->log, 2, "ex1_init_coms: init coms has suceeded\n");
++ a1logd(p->log, 2, "ex1_init_coms: init coms has succeeded\n");
+
+ return inst_ok;
+ }
@@ -1466,7 +1466,7 @@ static void dump_command(ex1 *p, ORD8 *b
if (flags & EX1_FLAG_NACK)
a1logd(p->log, 0, " Negative acknowldgement response\n");
@@ -671,6 +963,15 @@ Index: trunk/spectro/ex1.c
if (flags & EX1_FLAG_PVDEP)
a1logd(p->log, 0, " Protocol version is deprecated request\n");
+@@ -1752,7 +1752,7 @@ int nd /* nz to disable debug message
+ }
+
+ if (p->log->debug >= 8) {
+- a1logd(p->log,1,"\nex1_command: RECIEVING:\n");
++ a1logd(p->log,1,"\nex1_command: RECEIVING:\n");
+ dump_command(p, buf, rwbytes, p->log->debug);
+ }
+
Index: trunk/ccast/ccmes.c
===================================================================
--- trunk.orig/ccast/ccmes.c
@@ -697,6 +998,48 @@ Index: trunk/ccast/ccpacket.c
}
/* Establish an ccpacket connection - implementation */
+@@ -187,13 +187,13 @@ static ccpacket_err connect_ccpacket_imp
+ #endif
+ if ((rv = setsockopt(p->sock, SOL_SOCKET, SO_RCVTIMEO, (const char*)&tv,
+ sizeof(tv))) < 0) {
+- DBG((g_log,0,"setsockopt timout failed with %d, errno %d",rv,ERRNO))
++ DBG((g_log,0,"setsockopt timeout failed with %d, errno %d",rv,ERRNO))
+ return ccpacket_connect;
+ }
+ tv = 2000;
+ if ((rv = setsockopt(p->sock, SOL_SOCKET, SO_SNDTIMEO, (const char*)&tv,
+ sizeof(tv))) < 0) {
+- DBG((g_log,0,"setsockopt timout failed with %d, errno %d",rv,ERRNO))
++ DBG((g_log,0,"setsockopt timeout failed with %d, errno %d",rv,ERRNO))
+ return ccpacket_connect;
+ }
+ #else
+@@ -207,14 +207,14 @@ static ccpacket_err connect_ccpacket_imp
+ #endif
+ if ((rv = setsockopt(p->sock, SOL_SOCKET, SO_RCVTIMEO, (const char*)&tv,
+ sizeof(tv))) < 0) {
+- DBG((g_log,0,"setsockopt timout failed with %d, errno %d",rv,ERRNO))
++ DBG((g_log,0,"setsockopt timeout failed with %d, errno %d",rv,ERRNO))
+ return ccpacket_connect;
+ }
+ tv.tv_sec = 2;
+ tv.tv_usec = 0;
+ if ((rv = setsockopt(p->sock, SOL_SOCKET, SO_SNDTIMEO, (const char*)&tv,
+ sizeof(tv))) < 0) {
+- DBG((g_log,0,"setsockopt timout failed with %d, errno %d",rv,ERRNO))
++ DBG((g_log,0,"setsockopt timeout failed with %d, errno %d",rv,ERRNO))
+ return ccpacket_connect;
+ }
+ #endif
+@@ -224,7 +224,7 @@ static ccpacket_err connect_ccpacket_imp
+ ling.l_linger = 2; /* Two seconds */
+ if ((rv = setsockopt(p->sock, SOL_SOCKET, SO_LINGER, (const char*)&ling,
+ sizeof(ling))) < 0) {
+- DBG((g_log,0,"setsockopt timout failed with %d, errno %d",rv,ERRNO))
++ DBG((g_log,0,"setsockopt timeout failed with %d, errno %d",rv,ERRNO))
+ return ccpacket_connect;
+ }
+ #endif /* NEVER */
Index: trunk/spectro/xdg_bds.c
===================================================================
--- trunk.orig/spectro/xdg_bds.c
@@ -710,3 +1053,566 @@ Index: trunk/spectro/xdg_bds.c
case xdg_nopath:
return "There is no resulting path";
case xdg_mallformed:
+Index: trunk/icc/icc.c
+===================================================================
+--- trunk.orig/icc/icc.c
++++ trunk/icc/icc.c
+@@ -1472,7 +1472,7 @@ static const char *string_TagSignature(i
+ case icSigViewingCondDescTag:
+ return "Viewing Condition Description";
+ case icSigViewingConditionsTag:
+- return "Viewing Condition Paramaters";
++ return "Viewing Condition Parameters";
+
+ /* ArgyllCMS private tag: */
+ case icmSigAbsToRelTransSpace:
+Index: trunk/gamut/isecvol.c
+===================================================================
+--- trunk.orig/gamut/isecvol.c
++++ trunk/gamut/isecvol.c
+@@ -174,7 +174,7 @@ printf("~1 doing triangle %d from %s gam
+ inout[i] = 0;
+ }
+
+-printf("~1 verticies outside = %d\n",nout);
++printf("~1 vertices outside = %d\n",nout);
+
+ /* If none are in, skip this triangle */
+ if (nout == 3)
+Index: trunk/gamut/viewgam.c
+===================================================================
+--- trunk.orig/gamut/viewgam.c
++++ trunk/gamut/viewgam.c
+@@ -355,7 +355,7 @@ main(int argc, char *argv[]) {
+ error("Input file doesn't contain exactly two tables");
+
+ if ((nverts = pp->t[0].nsets) <= 0)
+- error("No verticies");
++ error("No vertices");
+ if ((ntris = pp->t[1].nsets) <= 0)
+ error("No triangles");
+
+Index: trunk/gamut/gamut.c
+===================================================================
+--- trunk.orig/gamut/gamut.c
++++ trunk/gamut/gamut.c
+@@ -2152,8 +2152,8 @@ static void check_triangulation(gamut *s
+ for (j = i+1; j < 3; j++) {
+ if (tp->v[i] == tp->v[j]) {
+ failed = 1;
+- printf("Validation failed - duplicate verticies:\n");
+- printf("Triangle %d, has verticies %d %d %d\n", tp->n, tp->v[0]->n, tp->v[1]->n, tp->v[2]->n);
++ printf("Validation failed - duplicate vertices:\n");
++ printf("Triangle %d, has vertices %d %d %d\n", tp->n, tp->v[0]->n, tp->v[1]->n, tp->v[2]->n);
+ fflush(stdout);
+ }
+ }
+@@ -2165,7 +2165,7 @@ static void check_triangulation(gamut *s
+ if (tp->e[i] == tp->e[j]) {
+ failed = 1;
+ printf("Validation failed - duplicate connectivity:\n");
+- printf("Triangle %d, has verticies %d %d %d\n", tp->n, tp->v[0]->n, tp->v[1]->n, tp->v[2]->n);
++ printf("Triangle %d, has vertices %d %d %d\n", tp->n, tp->v[0]->n, tp->v[1]->n, tp->v[2]->n);
+ printf("Triangle %d, has edges %d %d %d\n", tp->n, tp->e[0]->n, tp->e[1]->n, tp->e[2]->n);
+ fflush(stdout);
+ }
+@@ -2187,7 +2187,7 @@ static void check_triangulation(gamut *s
+ /* for this triangle is correct */
+ if (ei1 != i) {
+ failed = 1;
+- printf("Validation failed - triangle edge index doesn't match record withing edge:\n");
++ printf("Validation failed - triangle edge index doesn't match record within edge:\n");
+ printf("Triangle %d, edge index %d edge %d has record %d\n", tp->n, i, e->n, ei1);
+ fflush(stdout);
+ }
+@@ -2206,9 +2206,9 @@ static void check_triangulation(gamut *s
+ if ((e->v[0] != tp->v[i] || e->v[1] != tp->v[(i+1) % 3])
+ && (e->v[1] != tp->v[i] || e->v[0] != tp->v[(i+1) % 3])) {
+ failed = 1;
+- printf("Validation failed - edge doesn't have same verticies as triangle expects:\n");
+- printf("Triangle %d, has verticies %d %d\n", tp->n, tp->v[i]->n, tp->v[(i+1) % 3]->n);
+- printf("Edge %d, has verticies %d %d\n", e->n, e->v[0]->n, e->v[1]->n);
++ printf("Validation failed - edge doesn't have same vertices as triangle expects:\n");
++ printf("Triangle %d, has vertices %d %d\n", tp->n, tp->v[i]->n, tp->v[(i+1) % 3]->n);
++ printf("Edge %d, has vertices %d %d\n", e->n, e->v[0]->n, e->v[1]->n);
+ fflush(stdout);
+ }
+
+@@ -2690,7 +2690,7 @@ gamut *s
+ ff[1] = fsz * foffs[i][0] + s->cent[1];
+ ff[2] = fsz * foffs[i][1] + s->cent[2];
+ if ((tvs[j++] = expand_gamut(s, ff)) == NULL) {
+- fprintf(stderr,"gamut: internal error - failed to register a fake initial verticies!\n");
++ fprintf(stderr,"gamut: internal error - failed to register a fake initial vertices!\n");
+ exit (-1);
+ }
+ }
+@@ -2699,7 +2699,7 @@ gamut *s
+ s->doingfake = 0;
+
+ #ifdef NEVER
+- printf("Initial verticies:\n");
++ printf("Initial vertices:\n");
+ for (i = 0; i < 4; i++) {
+ printf(" %d: %f %f %f\n",tvs[i]->n, tvs[i]->p[0], tvs[i]->p[1], tvs[i]->p[2]);
+ }
+@@ -6427,7 +6427,7 @@ char *filename
+
+
+ if ((nverts = gam->t[0].nsets) <= 0) {
+- fprintf(stderr,"No verticies");
++ fprintf(stderr,"No vertices");
+ return 1;
+ }
+ if ((ntris = gam->t[1].nsets) <= 0) {
+Index: trunk/rspl/rev.c
+===================================================================
+--- trunk.orig/rspl/rev.c
++++ trunk/rspl/rev.c
+@@ -5868,7 +5868,7 @@ int sdi /* Sub-simplex dimensionali
+ x->face = 0;
+
+ #ifdef DEBUG
+- printf("Verticies = ");
++ printf("vertices = ");
+ for (i = 0; i <= sdi; i++)
+ printf("%d ",vcmb[i]);
+ printf("\n");
+@@ -9733,7 +9733,7 @@ rspl *s
+ vc.nilist = 0;
+ xlist = NULL;
+
+- DBG(("deleting verticies in all bxcells\n"));
++ DBG(("deleting vertices in all bxcells\n"));
+
+ /* The thinning may have deleted verticies from bxcell's that */
+ /* were not involved in the thinning, so go though all bxcells */
+@@ -9873,7 +9873,7 @@ rspl *s
+ //printf("~1 deleting vtx %d\n",vx->ix);
+ del_vtxrec_hash(&vc, vx->ix);
+ if (get_vtxrec(&vc, vx->ix) != NULL)
+- error("get_vtxrec suceeded after del_vtxrec_hash!");
++ error("get_vtxrec succeeded after del_vtxrec_hash!");
+ }
+ #else /* !DELETE_SHAD */
+ /* Keep track of deleted verticies that are in this bx, */
+@@ -10554,7 +10554,7 @@ rspl *s
+ }
+ }
+ printf("%d crossed triangles tested\n",notverts);
+- printf("%d hidden verticies retained for crossed triangles\n",nopreserved);
++ printf("%d hidden vertices retained for crossed triangles\n",nopreserved);
+ printf("Took %f secs to preserving crossing triangless\n",0.001 * (msec_time()-lmsec));
+ #endif
+ } /* End of preserve shadowed triangles */
+Index: trunk/spectro/munki.c
+===================================================================
+--- trunk.orig/spectro/munki.c
++++ trunk/spectro/munki.c
+@@ -113,7 +113,7 @@ munki_init_coms(inst *pp, baud_rate br,
+ return munki_interp_code(p, icoms2munki_err(se));
+ }
+
+- a1logd(p->log, 2, "munki_init_coms: init coms has suceeded\n");
++ a1logd(p->log, 2, "munki_init_coms: init coms has succeeded\n");
+
+ p->gotcoms = 1;
+ return inst_ok;
+@@ -525,7 +525,7 @@ munki_interp_error(inst *pp, munki_code
+ case MUNKI_INT_CREATE_EEPROM_STORE:
+ return "Error in creating EEProm store";
+ case MUNKI_INT_NEW_RSPL_FAILED:
+- return "Creating RSPL object faild";
++ return "Creating RSPL object failed";
+ case MUNKI_INT_CAL_SAVE:
+ return "Unable to save calibration to file";
+ case MUNKI_INT_CAL_RESTORE:
+Index: trunk/spectro/i1pro.c
+===================================================================
+--- trunk.orig/spectro/i1pro.c
++++ trunk/spectro/i1pro.c
+@@ -119,7 +119,7 @@ i1pro_init_coms(inst *pp, baud_rate br,
+ return i1pro_interp_code(p, icoms2i1pro_err(se));
+ }
+
+- a1logd(p->log, 2, "i1pro_init_coms: init coms has suceeded\n");
++ a1logd(p->log, 2, "i1pro_init_coms: init coms has succeeded\n");
+
+ p->gotcoms = 1;
+ return inst_ok;
+@@ -508,7 +508,7 @@ i1pro_interp_error(inst *pp, i1pro_code
+ case I1PRO_INT_EEPROM_DATA_MISSING:
+ return "EEProm data is missing";
+ case I1PRO_INT_NEW_RSPL_FAILED:
+- return "Creating RSPL object faild";
++ return "Creating RSPL object failed";
+ case I1PRO_INT_CAL_SAVE:
+ return "Unable to save calibration to file";
+ case I1PRO_INT_CAL_RESTORE:
+Index: trunk/xicc/mpp.c
+===================================================================
+--- trunk.orig/xicc/mpp.c
++++ trunk/xicc/mpp.c
+@@ -733,7 +733,7 @@ int use_fwa /* NZ to involke
+ error ("mpp->set_ilob, instrument doesn't have an FWA illuminent");
+
+ if (p->spc->set_fwa(p->spc, &inst, NULL, &white))
+- error ("mpp->set_ilob, set_fwa faild");
++ error ("mpp->set_ilob, set_fwa failed");
+ }
+
+ return 0;
+Index: trunk/plot/vrml.c
+===================================================================
+--- trunk.orig/plot/vrml.c
++++ trunk/plot/vrml.c
+@@ -642,7 +642,7 @@ double cc[3] /* Surface color, cc == NUL
+ fprintf(s->fp," ]\n");
+ fprintf(s->fp," }\n");
+ fprintf(s->fp,"\n");
+- fprintf(s->fp," coordIndex [ # Indexes of %s Verticies \n",
++ fprintf(s->fp," coordIndex [ # Indexes of %s Vertices \n",
+ lines ? "line" : "polygon");
+
+ /* Spit out the lines/triangles/quads */
+Index: trunk/target/ofps.c
+===================================================================
+--- trunk.orig/target/ofps.c
++++ trunk/target/ofps.c
+@@ -2612,7 +2612,7 @@ static int position_vtx(
+ if (tries > s->maxretries)
+ s->maxretries = tries;
+ #ifdef DEBUG
+- printf(" - comb %s suceeded on retry %d (max %d)\n",pcomb(di,vv->nix),tries,s->maxretries);
++ printf(" - comb %s succeeded on retry %d (max %d)\n",pcomb(di,vv->nix),tries,s->maxretries);
+ printf(" oog = %f, eperr = %f, ceperr = %f\n",vv->oog,vv->eperr,vv->ceperr);
+ #endif
+ //if (tries > 10)
+@@ -2627,7 +2627,7 @@ static int position_vtx(
+
+ #ifdef DUMP_FERR /* Create .tiff of dnsq function error */
+ if (tries >= DUMP_FERR) {
+- printf("Suceeded on retry %d, dumping debug rasters\n",tries);
++ printf("Succeeded on retry %d, dumping debug rasters\n",tries);
+
+ /* Re-run the last unsucessful dnsq, to trace the path */
+ pcx.debug = 1;
+@@ -6221,7 +6221,7 @@ static int ofps_findhit_vtxs(ofps *s, no
+ int hit = 0;
+
+ if (nn->ix < 0)
+- error("ofps_findhit_vtxs given gamut boudary node ix %d",nn->ix);
++ error("ofps_findhit_vtxs given gamut boundary node ix %d",nn->ix);
+
+ #ifdef DEBUG
+ if (s->agrid_init == 0)
+@@ -8023,7 +8023,7 @@ ofps *s
+ warning("Verify of incremental vertexes failed!");
+ printf("Verify of incremental vertexes failed!\n");
+ } else {
+- warning("Verify of incremental vertexes suceeded!");
++ warning("Verify of incremental vertexes succeeded!");
+ }
+ #ifdef DUMP_STRUCTURE
+ dump_node_vtxs(s, 1);
+Index: trunk/spectro/synthread.c
+===================================================================
+--- trunk.orig/spectro/synthread.c
++++ trunk/spectro/synthread.c
+@@ -487,14 +487,14 @@ printf("~1 omax = %f %f %f\n", md.omax[0
+ else if (nmask == ICX_K && sep_ins == icSigCmykData)
+ gfudge = 2;
+ else if (icx_colorant_comb_match_icc(nmask, sep_ins) == 0) {
+- error("Separation ICC device space '%s' dosen't match TI1 '%s'",
++ error("Separation ICC device space '%s' doesn't match TI1 '%s'",
+ icm2str(icmColorSpaceSignature, sep_ins),
+ ident); /* Should free(). */
+ }
+
+ /* Check if separation ICC output is compatible with ICC/MPP/TI3 conversion */
+ if (sep_outs != ins)
+- error("Synthetic device space '%s' dosen't match Separation ICC '%s'",
++ error("Synthetic device space '%s' doesn't match Separation ICC '%s'",
+ icm2str(icmColorSpaceSignature, ins),
+ icm2str(icmColorSpaceSignature, sep_outs));
+ } else {
+@@ -504,7 +504,7 @@ printf("~1 omax = %f %f %f\n", md.omax[0
+ else if (nmask == ICX_K && ins == icSigCmykData)
+ gfudge = 2; /* Should allow for other colorant combo's that include black */
+ else if (icx_colorant_comb_match_icc(nmask, ins) == 0) {
+- error("Synthetic device space '%s' dosen't match TI1 '%s'",
++ error("Synthetic device space '%s' doesn't match TI1 '%s'",
+ icm2str(icmColorSpaceSignature, ins),
+ ident); // Should free().
+ }
+Index: trunk/spectro/smcube.c
+===================================================================
+--- trunk.orig/spectro/smcube.c
++++ trunk/spectro/smcube.c
+@@ -292,7 +292,7 @@ smcube_init_coms(inst *pp, baud_rate br,
+ }
+ amutex_unlock(p->lock);
+ }
+- a1logd(p->log, 2, "smcube_init_coms: init coms has suceeded\n");
++ a1logd(p->log, 2, "smcube_init_coms: init coms has succeeded\n");
+
+ p->gotcoms = 1;
+
+@@ -1247,7 +1247,7 @@ smcube_get_idle_time(smcube *p, int *pit
+ itime = read_ORD16_be(buf + 4);
+
+ if (!nd)
+- a1logd(p->log, 2, "smcube_get_idle_time: returing %d\n",itime);
++ a1logd(p->log, 2, "smcube_get_idle_time: returning %d\n",itime);
+
+ if (pitime != NULL)
+ *pitime = itime;
+@@ -1292,11 +1292,11 @@ smcube_fact_measure(smcube *p, double *X
+ XYZ[0] = IEEE754todouble(read_ORD32_be(buf + 4));
+ XYZ[1] = IEEE754todouble(read_ORD32_be(buf + 8));
+ XYZ[2] = IEEE754todouble(read_ORD32_be(buf + 12));
+- a1logd(p->log, 2, "smcube_fact_measure: returing L*a*b* %f %f %f\n",XYZ[0], XYZ[1], XYZ[2]);
++ a1logd(p->log, 2, "smcube_fact_measure: returning L*a*b* %f %f %f\n",XYZ[0], XYZ[1], XYZ[2]);
+
+ icmLab2XYZ(&icmD50_100, XYZ, XYZ);
+
+- a1logd(p->log, 2, "smcube_fact_measure: returing XYZ %f %f %f\n",XYZ[0], XYZ[1], XYZ[2]);
++ a1logd(p->log, 2, "smcube_fact_measure: returning XYZ %f %f %f\n",XYZ[0], XYZ[1], XYZ[2]);
+
+ return inst_ok;
+ }
+@@ -1338,7 +1338,7 @@ smcube_poll_measure(smcube *p, double to
+ p->XYZ[0] = IEEE754todouble(read_ORD32_be(buf + 4));
+ p->XYZ[1] = IEEE754todouble(read_ORD32_be(buf + 8));
+ p->XYZ[2] = IEEE754todouble(read_ORD32_be(buf + 12));
+- if (!nd) a1logd(p->log, 2, "smcube_poll_measure: returing L*a*b* %f %f %f\n",p->XYZ[0], p->XYZ[1], p->XYZ[2]);
++ if (!nd) a1logd(p->log, 2, "smcube_poll_measure: returning L*a*b* %f %f %f\n",p->XYZ[0], p->XYZ[1], p->XYZ[2]);
+
+ icmLab2XYZ(&icmD50_100, p->XYZ, p->XYZ);
+
+Index: trunk/spectro/kleink10.c
+===================================================================
+--- trunk.orig/spectro/kleink10.c
++++ trunk/spectro/kleink10.c
+@@ -728,7 +728,7 @@ int ix /* Klein calibration index 1
+
+ if (buf[0] != 'D' || buf[1] != '1') {
+ amutex_unlock(p->lock);
+- a1logd(p->log, 1, "k10_read_cal_matrix: didn't get echo'd commad D1\n");
++ a1logd(p->log, 1, "k10_read_cal_matrix: didn't get echo'd command D1\n");
+ return inst_protocol_error;
+ }
+
+@@ -2067,7 +2067,7 @@ int *pinstmsec) { /* Return instrument r
+ break;
+ }
+
+- a1logd(p->log, 2, "k10_meas_delay: stoped at sample %d time %f\n",i,samp[i].sec);
++ a1logd(p->log, 2, "k10_meas_delay: stopped at sample %d time %f\n",i,samp[i].sec);
+
+ /* Compute overall delay */
+ dispmsec = (int)(samp[i].sec * 1000.0 + 0.5);
+Index: trunk/spectro/i1d3.c
+===================================================================
+--- trunk.orig/spectro/i1d3.c
++++ trunk/spectro/i1d3.c
+@@ -2503,7 +2503,7 @@ i1d3_init_coms(inst *pp, baud_rate br, f
+ a1logd(p->log, 1, "i1d3_init_coms: failed with rv = 0x%x\n",ev);
+ return ev;
+ }
+- a1logd(p->log, 2, "i1d3_init_coms: suceeded\n");
++ a1logd(p->log, 2, "i1d3_init_coms: succeeded\n");
+
+ p->gotcoms = 1;
+ return inst_ok;
+@@ -3179,7 +3179,7 @@ int *pinstmsec) { /* Return instrumen
+ break;
+ }
+
+- a1logd(p->log, 2, "i1d3_meas_delay: stoped at sample %d time %f\n",i,samp[i].sec);
++ a1logd(p->log, 2, "i1d3_meas_delay: stopped at sample %d time %f\n",i,samp[i].sec);
+
+ /* Compute overall delay */
+ dispmsec = (int)(samp[i].sec * 1000.0 + 0.5);
+Index: trunk/spectro/i1disp.c
+===================================================================
+--- trunk.orig/spectro/i1disp.c
++++ trunk/spectro/i1disp.c
+@@ -1359,7 +1359,7 @@ i1disp_read_refrate(
+ *ref_rate = rrate;
+ return inst_ok;
+ } else {
+- a1logd(p->log, 3, "No discernable refresh frequency measured\n");
++ a1logd(p->log, 3, "No discernible refresh frequency measured\n");
+ if (ref_rate != NULL)
+ *ref_rate = 0.0;
+ return inst_misread;
+Index: trunk/ccast/ccmdns.c
+===================================================================
+--- trunk.orig/ccast/ccmdns.c
++++ trunk/ccast/ccmdns.c
+@@ -458,7 +458,7 @@ static int init_receive_mDNS(SOCKET *pso
+ DWORD tv;
+ tv = 100;
+ if (setsockopt(sock, SOL_SOCKET, SO_RCVTIMEO, (const char*)&tv, sizeof(tv)) < 0) {
+- DBG((g_log,0,"setsockopt timout failed with %d\n",ERRNO))
++ DBG((g_log,0,"setsockopt timeout failed with %d\n",ERRNO))
+ closesocket(sock);
+ return 1;
+ }
+@@ -469,7 +469,7 @@ static int init_receive_mDNS(SOCKET *pso
+ tv.tv_sec = 0;
+ tv.tv_usec = 100 * 1000;
+ if (setsockopt(sock, SOL_SOCKET, SO_RCVTIMEO, (const char*)&tv, sizeof(tv)) < 0) {
+- DBG((g_log,0,"setsockopt timout failed with %d\n",ERRNO))
++ DBG((g_log,0,"setsockopt timeout failed with %d\n",ERRNO))
+ closesocket(sock);
+ return 1;
+ }
+Index: trunk/spectro/spyd2.c
+===================================================================
+--- trunk.orig/spectro/spyd2.c
++++ trunk/spectro/spyd2.c
+@@ -2915,7 +2915,7 @@ spyd2_init_coms(inst *pp, baud_rate br,
+ return spyd2_interp_code((inst *)p, icoms2spyd2_err(se));
+ }
+
+- a1logd(p->log, 2, "spyd2_init_coms: suceeded\n");
++ a1logd(p->log, 2, "spyd2_init_coms: succeeded\n");
+
+ p->gotcoms = 1;
+ return inst_ok;
+@@ -3372,9 +3372,9 @@ spyd2_interp_error(inst *pp, int ec) {
+ case SPYD2_BADREADSIZE:
+ return "Didn't read expected amount of data";
+ case SPYD2_TRIGTIMEOUT:
+- return "Trigger timout";
++ return "Trigger timeout";
+ case SPYD2_OVERALLTIMEOUT:
+- return "Overall timout";
++ return "Overall timeout";
+ case SPYD2_BAD_EE_CRC:
+ return "Serial EEProm CRC failed";
+
+Index: trunk/spectro/specbos.c
+===================================================================
+--- trunk.orig/spectro/specbos.c
++++ trunk/spectro/specbos.c
+@@ -340,7 +340,7 @@ specbos_init_coms(inst *pp, baud_rate br
+ a1logd(p->log, 2, "specbos_init_coms: unrecognised model %04d\n",p->model);
+ return inst_unknown_model;
+ }
+- a1logd(p->log, 2, "specbos_init_coms: init coms has suceeded\n");
++ a1logd(p->log, 2, "specbos_init_coms: init coms has succeeded\n");
+
+ p->gotcoms = 1;
+
+@@ -1559,7 +1559,7 @@ char id[CALIDLEN] /* Condition identifi
+ if ((ev = specbos_get_n_a_cals((inst *)p, &needed, &available)) != inst_ok)
+ return ev;
+
+- a1logd(p->log,4,"specbos_calibrate: needed 0x%x, avaialble 0x%x\n",needed, available);
++ a1logd(p->log,4,"specbos_calibrate: needed 0x%x, available 0x%x\n",needed, available);
+
+ /* Translate inst_calt_all/needed into something specific */
+ if (*calt == inst_calt_all
+Index: trunk/plot/plot.c
+===================================================================
+--- trunk.orig/plot/plot.c
++++ trunk/plot/plot.c
+@@ -2434,7 +2434,7 @@ static void dprintf(char *fmt, ...) {
+ printf("~1 found NtQueryInformationProcess\n"); fflush(stdout);
+ if(NtQueryInformationProcess(GetCurrentProcess(), 0,
+ &pbi, sizeof(pbi), &ulSize) >= 0 && ulSize == sizeof(pbi)) {
+-printf("~1 NtQueryInformationProcess suceeded\n"); fflush(stdout);
++printf("~1 NtQueryInformationProcess succeeded\n"); fflush(stdout);
+
+ *(FARPROC *)&AttachConsole =
+ GetProcAddress(LoadLibraryA("kernel32.dll"), "AttachConsole");
+Index: trunk/spectro/dtp22.c
+===================================================================
+--- trunk.orig/spectro/dtp22.c
++++ trunk/spectro/dtp22.c
+@@ -277,7 +277,7 @@ dtp22_init_coms(inst *pp, baud_rate br,
+ return inst_coms_fail;
+ }
+
+- a1logd(p->log, 2, "dtp22_init_coms: init coms has suceeded\n");
++ a1logd(p->log, 2, "dtp22_init_coms: init coms has succeeded\n");
+
+ p->gotcoms = 1;
+ return inst_ok;
+Index: trunk/spectro/dtp41.c
+===================================================================
+--- trunk.orig/spectro/dtp41.c
++++ trunk/spectro/dtp41.c
+@@ -255,7 +255,7 @@ dtp41_init_coms(inst *pp, baud_rate br,
+ return inst_coms_fail;
+ }
+
+- a1logd(p->log, 2, "dtp41_init_coms: init coms has suceeded\n");
++ a1logd(p->log, 2, "dtp41_init_coms: init coms has succeeded\n");
+
+ p->gotcoms = 1;
+ return inst_ok;
+Index: trunk/xicc/xutils.c
+===================================================================
+--- trunk.orig/xicc/xutils.c
++++ trunk/xicc/xutils.c
+@@ -147,7 +147,7 @@ icc *read_embedded_icc(char *file_name)
+ TIFFSetWarningHandler(oldwarnh);
+ TIFFSetErrorHandlerExt(olderrhx);
+ TIFFSetWarningHandlerExt(oldwarnhx);
+- debug("TIFFOpen suceeded\n");
++ debug("TIFFOpen succeeded\n");
+
+ if (TIFFGetField(rh, TIFFTAG_ICCPROFILE, &size, &tag) == 0 || size == 0) {
+ debug2((errout,"no ICC profile found in '%s'\n",file_name));
+Index: trunk/spectro/rspec.c
+===================================================================
+--- trunk.orig/spectro/rspec.c
++++ trunk/spectro/rspec.c
+@@ -955,7 +955,7 @@ int calf_open(calf *x, a1log *log, char
+ }
+ xdg_free(cal_paths, no_paths);
+
+- a1logd(x->log,2,"calf_open: suceeded\n");
++ a1logd(x->log,2,"calf_open: succeeded\n");
+
+ return 0;
+ }
+Index: trunk/spectro/chartread.c
+===================================================================
+--- trunk.orig/spectro/chartread.c
++++ trunk/spectro/chartread.c
+@@ -1172,7 +1172,7 @@ printf("~1 using emis mode\n");
+
+ /* Or something is wrong with instrument capabilities */
+ } else {
+- printf("\nNo reasonable trigger mode avilable for this instrument\n");
++ printf("\nNo reasonable trigger mode available for this instrument\n");
+ it->del(it);
+ return -1;
+ }
+@@ -1685,7 +1685,7 @@ printf("~1 using emis mode\n");
+
+ /* Or something is wrong with instrument capabilities */
+ } else {
+- printf("\nNo reasonable trigger mode avilable for this instrument\n");
++ printf("\nNo reasonable trigger mode available for this instrument\n");
+ it->del(it);
+ return -1;
+ }
+Index: trunk/spectro/illumread.c
+===================================================================
+--- trunk.orig/spectro/illumread.c
++++ trunk/spectro/illumread.c
+@@ -663,7 +663,7 @@ int main(int argc, char *argv[])
+
+ /* Or something is wrong with instrument capabilities */
+ } else {
+- printf("!!! No reasonable trigger mode avilable for this instrument !!!\n");
++ printf("!!! No reasonable trigger mode available for this instrument !!!\n");
+ continue;
+ }
+ if ((rv = it->get_set_opt(it, trigmode)) != inst_ok) {
diff --git a/spectro/linear.cal b/spectro/linear.cal
deleted file mode 100644
index b5e06c0..0000000
--- a/spectro/linear.cal
+++ /dev/null
@@ -1,272 +0,0 @@
-CAL
-
-DESCRIPTOR "Argyll Device Calibration Curves"
-ORIGINATOR "Argyll synthcal"
-CREATED "Wed Sep 28 02:35:54 2016"
-DEVICE_CLASS "DISPLAY"
-COLOR_REP "RGB"
-
-NUMBER_OF_FIELDS 4
-BEGIN_DATA_FORMAT
-RGB_I RGB_R RGB_G RGB_B
-END_DATA_FORMAT
-
-NUMBER_OF_SETS 256
-BEGIN_DATA
-0.00000 0.00000 0.00000 0.00000
-0.00392157 0.00392157 0.00392157 0.00392157
-0.00784314 0.00784314 0.00784314 0.00784314
-0.0117647 0.0117647 0.0117647 0.0117647
-0.0156863 0.0156863 0.0156863 0.0156863
-0.0196078 0.0196078 0.0196078 0.0196078
-0.0235294 0.0235294 0.0235294 0.0235294
-0.0274510 0.0274510 0.0274510 0.0274510
-0.0313725 0.0313725 0.0313725 0.0313725
-0.0352941 0.0352941 0.0352941 0.0352941
-0.0392157 0.0392157 0.0392157 0.0392157
-0.0431373 0.0431373 0.0431373 0.0431373
-0.0470588 0.0470588 0.0470588 0.0470588
-0.0509804 0.0509804 0.0509804 0.0509804
-0.0549020 0.0549020 0.0549020 0.0549020
-0.0588235 0.0588235 0.0588235 0.0588235
-0.0627451 0.0627451 0.0627451 0.0627451
-0.0666667 0.0666667 0.0666667 0.0666667
-0.0705882 0.0705882 0.0705882 0.0705882
-0.0745098 0.0745098 0.0745098 0.0745098
-0.0784314 0.0784314 0.0784314 0.0784314
-0.0823529 0.0823529 0.0823529 0.0823529
-0.0862745 0.0862745 0.0862745 0.0862745
-0.0901961 0.0901961 0.0901961 0.0901961
-0.0941176 0.0941176 0.0941176 0.0941176
-0.0980392 0.0980392 0.0980392 0.0980392
-0.101961 0.101961 0.101961 0.101961
-0.105882 0.105882 0.105882 0.105882
-0.109804 0.109804 0.109804 0.109804
-0.113725 0.113725 0.113725 0.113725
-0.117647 0.117647 0.117647 0.117647
-0.121569 0.121569 0.121569 0.121569
-0.125490 0.125490 0.125490 0.125490
-0.129412 0.129412 0.129412 0.129412
-0.133333 0.133333 0.133333 0.133333
-0.137255 0.137255 0.137255 0.137255
-0.141176 0.141176 0.141176 0.141176
-0.145098 0.145098 0.145098 0.145098
-0.149020 0.149020 0.149020 0.149020
-0.152941 0.152941 0.152941 0.152941
-0.156863 0.156863 0.156863 0.156863
-0.160784 0.160784 0.160784 0.160784
-0.164706 0.164706 0.164706 0.164706
-0.168627 0.168627 0.168627 0.168627
-0.172549 0.172549 0.172549 0.172549
-0.176471 0.176471 0.176471 0.176471
-0.180392 0.180392 0.180392 0.180392
-0.184314 0.184314 0.184314 0.184314
-0.188235 0.188235 0.188235 0.188235
-0.192157 0.192157 0.192157 0.192157
-0.196078 0.196078 0.196078 0.196078
-0.200000 0.200000 0.200000 0.200000
-0.203922 0.203922 0.203922 0.203922
-0.207843 0.207843 0.207843 0.207843
-0.211765 0.211765 0.211765 0.211765
-0.215686 0.215686 0.215686 0.215686
-0.219608 0.219608 0.219608 0.219608
-0.223529 0.223529 0.223529 0.223529
-0.227451 0.227451 0.227451 0.227451
-0.231373 0.231373 0.231373 0.231373
-0.235294 0.235294 0.235294 0.235294
-0.239216 0.239216 0.239216 0.239216
-0.243137 0.243137 0.243137 0.243137
-0.247059 0.247059 0.247059 0.247059
-0.250980 0.250980 0.250980 0.250980
-0.254902 0.254902 0.254902 0.254902
-0.258824 0.258824 0.258824 0.258824
-0.262745 0.262745 0.262745 0.262745
-0.266667 0.266667 0.266667 0.266667
-0.270588 0.270588 0.270588 0.270588
-0.274510 0.274510 0.274510 0.274510
-0.278431 0.278431 0.278431 0.278431
-0.282353 0.282353 0.282353 0.282353
-0.286275 0.286275 0.286275 0.286275
-0.290196 0.290196 0.290196 0.290196
-0.294118 0.294118 0.294118 0.294118
-0.298039 0.298039 0.298039 0.298039
-0.301961 0.301961 0.301961 0.301961
-0.305882 0.305882 0.305882 0.305882
-0.309804 0.309804 0.309804 0.309804
-0.313725 0.313725 0.313725 0.313725
-0.317647 0.317647 0.317647 0.317647
-0.321569 0.321569 0.321569 0.321569
-0.325490 0.325490 0.325490 0.325490
-0.329412 0.329412 0.329412 0.329412
-0.333333 0.333333 0.333333 0.333333
-0.337255 0.337255 0.337255 0.337255
-0.341176 0.341176 0.341176 0.341176
-0.345098 0.345098 0.345098 0.345098
-0.349020 0.349020 0.349020 0.349020
-0.352941 0.352941 0.352941 0.352941
-0.356863 0.356863 0.356863 0.356863
-0.360784 0.360784 0.360784 0.360784
-0.364706 0.364706 0.364706 0.364706
-0.368627 0.368627 0.368627 0.368627
-0.372549 0.372549 0.372549 0.372549
-0.376471 0.376471 0.376471 0.376471
-0.380392 0.380392 0.380392 0.380392
-0.384314 0.384314 0.384314 0.384314
-0.388235 0.388235 0.388235 0.388235
-0.392157 0.392157 0.392157 0.392157
-0.396078 0.396078 0.396078 0.396078
-0.400000 0.400000 0.400000 0.400000
-0.403922 0.403922 0.403922 0.403922
-0.407843 0.407843 0.407843 0.407843
-0.411765 0.411765 0.411765 0.411765
-0.415686 0.415686 0.415686 0.415686
-0.419608 0.419608 0.419608 0.419608
-0.423529 0.423529 0.423529 0.423529
-0.427451 0.427451 0.427451 0.427451
-0.431373 0.431373 0.431373 0.431373
-0.435294 0.435294 0.435294 0.435294
-0.439216 0.439216 0.439216 0.439216
-0.443137 0.443137 0.443137 0.443137
-0.447059 0.447059 0.447059 0.447059
-0.450980 0.450980 0.450980 0.450980
-0.454902 0.454902 0.454902 0.454902
-0.458824 0.458824 0.458824 0.458824
-0.462745 0.462745 0.462745 0.462745
-0.466667 0.466667 0.466667 0.466667
-0.470588 0.470588 0.470588 0.470588
-0.474510 0.474510 0.474510 0.474510
-0.478431 0.478431 0.478431 0.478431
-0.482353 0.482353 0.482353 0.482353
-0.486275 0.486275 0.486275 0.486275
-0.490196 0.490196 0.490196 0.490196
-0.494118 0.494118 0.494118 0.494118
-0.498039 0.498039 0.498039 0.498039
-0.501961 0.501961 0.501961 0.501961
-0.505882 0.505882 0.505882 0.505882
-0.509804 0.509804 0.509804 0.509804
-0.513725 0.513725 0.513725 0.513725
-0.517647 0.517647 0.517647 0.517647
-0.521569 0.521569 0.521569 0.521569
-0.525490 0.525490 0.525490 0.525490
-0.529412 0.529412 0.529412 0.529412
-0.533333 0.533333 0.533333 0.533333
-0.537255 0.537255 0.537255 0.537255
-0.541176 0.541176 0.541176 0.541176
-0.545098 0.545098 0.545098 0.545098
-0.549020 0.549020 0.549020 0.549020
-0.552941 0.552941 0.552941 0.552941
-0.556863 0.556863 0.556863 0.556863
-0.560784 0.560784 0.560784 0.560784
-0.564706 0.564706 0.564706 0.564706
-0.568627 0.568627 0.568627 0.568627
-0.572549 0.572549 0.572549 0.572549
-0.576471 0.576471 0.576471 0.576471
-0.580392 0.580392 0.580392 0.580392
-0.584314 0.584314 0.584314 0.584314
-0.588235 0.588235 0.588235 0.588235
-0.592157 0.592157 0.592157 0.592157
-0.596078 0.596078 0.596078 0.596078
-0.600000 0.600000 0.600000 0.600000
-0.603922 0.603922 0.603922 0.603922
-0.607843 0.607843 0.607843 0.607843
-0.611765 0.611765 0.611765 0.611765
-0.615686 0.615686 0.615686 0.615686
-0.619608 0.619608 0.619608 0.619608
-0.623529 0.623529 0.623529 0.623529
-0.627451 0.627451 0.627451 0.627451
-0.631373 0.631373 0.631373 0.631373
-0.635294 0.635294 0.635294 0.635294
-0.639216 0.639216 0.639216 0.639216
-0.643137 0.643137 0.643137 0.643137
-0.647059 0.647059 0.647059 0.647059
-0.650980 0.650980 0.650980 0.650980
-0.654902 0.654902 0.654902 0.654902
-0.658824 0.658824 0.658824 0.658824
-0.662745 0.662745 0.662745 0.662745
-0.666667 0.666667 0.666667 0.666667
-0.670588 0.670588 0.670588 0.670588
-0.674510 0.674510 0.674510 0.674510
-0.678431 0.678431 0.678431 0.678431
-0.682353 0.682353 0.682353 0.682353
-0.686275 0.686275 0.686275 0.686275
-0.690196 0.690196 0.690196 0.690196
-0.694118 0.694118 0.694118 0.694118
-0.698039 0.698039 0.698039 0.698039
-0.701961 0.701961 0.701961 0.701961
-0.705882 0.705882 0.705882 0.705882
-0.709804 0.709804 0.709804 0.709804
-0.713725 0.713725 0.713725 0.713725
-0.717647 0.717647 0.717647 0.717647
-0.721569 0.721569 0.721569 0.721569
-0.725490 0.725490 0.725490 0.725490
-0.729412 0.729412 0.729412 0.729412
-0.733333 0.733333 0.733333 0.733333
-0.737255 0.737255 0.737255 0.737255
-0.741176 0.741176 0.741176 0.741176
-0.745098 0.745098 0.745098 0.745098
-0.749020 0.749020 0.749020 0.749020
-0.752941 0.752941 0.752941 0.752941
-0.756863 0.756863 0.756863 0.756863
-0.760784 0.760784 0.760784 0.760784
-0.764706 0.764706 0.764706 0.764706
-0.768627 0.768627 0.768627 0.768627
-0.772549 0.772549 0.772549 0.772549
-0.776471 0.776471 0.776471 0.776471
-0.780392 0.780392 0.780392 0.780392
-0.784314 0.784314 0.784314 0.784314
-0.788235 0.788235 0.788235 0.788235
-0.792157 0.792157 0.792157 0.792157
-0.796078 0.796078 0.796078 0.796078
-0.800000 0.800000 0.800000 0.800000
-0.803922 0.803922 0.803922 0.803922
-0.807843 0.807843 0.807843 0.807843
-0.811765 0.811765 0.811765 0.811765
-0.815686 0.815686 0.815686 0.815686
-0.819608 0.819608 0.819608 0.819608
-0.823529 0.823529 0.823529 0.823529
-0.827451 0.827451 0.827451 0.827451
-0.831373 0.831373 0.831373 0.831373
-0.835294 0.835294 0.835294 0.835294
-0.839216 0.839216 0.839216 0.839216
-0.843137 0.843137 0.843137 0.843137
-0.847059 0.847059 0.847059 0.847059
-0.850980 0.850980 0.850980 0.850980
-0.854902 0.854902 0.854902 0.854902
-0.858824 0.858824 0.858824 0.858824
-0.862745 0.862745 0.862745 0.862745
-0.866667 0.866667 0.866667 0.866667
-0.870588 0.870588 0.870588 0.870588
-0.874510 0.874510 0.874510 0.874510
-0.878431 0.878431 0.878431 0.878431
-0.882353 0.882353 0.882353 0.882353
-0.886275 0.886275 0.886275 0.886275
-0.890196 0.890196 0.890196 0.890196
-0.894118 0.894118 0.894118 0.894118
-0.898039 0.898039 0.898039 0.898039
-0.901961 0.901961 0.901961 0.901961
-0.905882 0.905882 0.905882 0.905882
-0.909804 0.909804 0.909804 0.909804
-0.913725 0.913725 0.913725 0.913725
-0.917647 0.917647 0.917647 0.917647
-0.921569 0.921569 0.921569 0.921569
-0.925490 0.925490 0.925490 0.925490
-0.929412 0.929412 0.929412 0.929412
-0.933333 0.933333 0.933333 0.933333
-0.937255 0.937255 0.937255 0.937255
-0.941176 0.941176 0.941176 0.941176
-0.945098 0.945098 0.945098 0.945098
-0.949020 0.949020 0.949020 0.949020
-0.952941 0.952941 0.952941 0.952941
-0.956863 0.956863 0.956863 0.956863
-0.960784 0.960784 0.960784 0.960784
-0.964706 0.964706 0.964706 0.964706
-0.968627 0.968627 0.968627 0.968627
-0.972549 0.972549 0.972549 0.972549
-0.976471 0.976471 0.976471 0.976471
-0.980392 0.980392 0.980392 0.980392
-0.984314 0.984314 0.984314 0.984314
-0.988235 0.988235 0.988235 0.988235
-0.992157 0.992157 0.992157 0.992157
-0.996078 0.996078 0.996078 0.996078
-1.000000 1.000000 1.000000 1.000000
-END_DATA
diff --git a/spectro/strange.cal b/spectro/strange.cal
deleted file mode 100644
index 1e9451d..0000000
--- a/spectro/strange.cal
+++ /dev/null
@@ -1,272 +0,0 @@
-CAL
-
-DESCRIPTOR "Argyll Device Calibration Curves"
-ORIGINATOR "Argyll synthcal"
-CREATED "Wed Sep 28 02:35:54 2016"
-DEVICE_CLASS "DISPLAY"
-COLOR_REP "RGB"
-
-NUMBER_OF_FIELDS 4
-BEGIN_DATA_FORMAT
-RGB_I RGB_R RGB_G RGB_B
-END_DATA_FORMAT
-
-NUMBER_OF_SETS 256
-BEGIN_DATA
-0.00000 0.00000 0.00000 0.00000
-0.00392157 0.0000567518 0.0118787 0.0186065
-0.00784314 0.000184387 0.0206820 0.0302263
-0.0117647 0.000367355 0.0286065 0.0401466
-0.0156863 0.000599076 0.0360094 0.0491028
-0.0196078 0.000875445 0.0430471 0.0574042
-0.0235294 0.00119354 0.0498068 0.0652184
-0.0274510 0.00155112 0.0563438 0.0726496
-0.0313725 0.00194640 0.0626960 0.0797678
-0.0352941 0.00237789 0.0688909 0.0866232
-0.0392157 0.00284433 0.0749493 0.0932533
-0.0431373 0.00334462 0.0808876 0.0996872
-0.0470588 0.00387782 0.0867187 0.105948
-0.0509804 0.00444307 0.0924533 0.112053
-0.0549020 0.00503962 0.0981003 0.118020
-0.0588235 0.00566676 0.103667 0.123859
-0.0627451 0.00632388 0.109160 0.129583
-0.0666667 0.00701040 0.114585 0.135201
-0.0705882 0.00772579 0.119946 0.140720
-0.0745098 0.00846956 0.125248 0.146148
-0.0784314 0.00924125 0.130494 0.151490
-0.0823529 0.0100404 0.135689 0.156754
-0.0862745 0.0108667 0.140834 0.161942
-0.0901961 0.0117197 0.145932 0.167061
-0.0941176 0.0125991 0.150986 0.172112
-0.0980392 0.0135045 0.155998 0.177102
-0.101961 0.0144356 0.160971 0.182031
-0.105882 0.0153921 0.165905 0.186904
-0.109804 0.0163738 0.170803 0.191723
-0.113725 0.0173803 0.175665 0.196491
-0.117647 0.0184114 0.180495 0.201210
-0.121569 0.0194668 0.185292 0.205882
-0.125490 0.0205464 0.190059 0.210508
-0.129412 0.0216498 0.194796 0.215092
-0.133333 0.0227769 0.199504 0.219634
-0.137255 0.0239274 0.204184 0.224136
-0.141176 0.0251012 0.208838 0.228600
-0.145098 0.0262980 0.213466 0.233027
-0.149020 0.0275177 0.218069 0.237418
-0.152941 0.0287600 0.222648 0.241774
-0.156863 0.0300249 0.227204 0.246097
-0.160784 0.0313121 0.231737 0.250388
-0.164706 0.0326215 0.236248 0.254647
-0.168627 0.0339528 0.240737 0.258876
-0.172549 0.0353061 0.245205 0.263076
-0.176471 0.0366810 0.249654 0.267247
-0.180392 0.0380775 0.254082 0.271391
-0.184314 0.0394954 0.258491 0.275507
-0.188235 0.0409345 0.262882 0.279597
-0.192157 0.0423948 0.267254 0.283662
-0.196078 0.0438762 0.271609 0.287702
-0.200000 0.0453784 0.275946 0.291718
-0.203922 0.0469014 0.280266 0.295710
-0.207843 0.0484450 0.284570 0.299680
-0.211765 0.0500091 0.288857 0.303627
-0.215686 0.0515937 0.293128 0.307552
-0.219608 0.0531985 0.297384 0.311455
-0.223529 0.0548235 0.301625 0.315338
-0.227451 0.0564686 0.305851 0.319201
-0.231373 0.0581337 0.310063 0.323043
-0.235294 0.0598187 0.314260 0.326866
-0.239216 0.0615234 0.318443 0.330670
-0.243137 0.0632478 0.322613 0.334456
-0.247059 0.0649918 0.326769 0.338223
-0.250980 0.0667553 0.330911 0.341972
-0.254902 0.0685382 0.335041 0.345703
-0.258824 0.0703403 0.339159 0.349418
-0.262745 0.0721617 0.343264 0.353115
-0.266667 0.0740022 0.347356 0.356797
-0.270588 0.0758618 0.351437 0.360461
-0.274510 0.0777403 0.355505 0.364110
-0.278431 0.0796377 0.359563 0.367744
-0.282353 0.0815539 0.363608 0.371362
-0.286275 0.0834889 0.367643 0.374965
-0.290196 0.0854424 0.371666 0.378553
-0.294118 0.0874146 0.375679 0.382127
-0.298039 0.0894052 0.379681 0.385686
-0.301961 0.0914143 0.383672 0.389231
-0.305882 0.0934417 0.387653 0.392763
-0.309804 0.0954873 0.391624 0.396281
-0.313725 0.0975512 0.395585 0.399786
-0.317647 0.0996332 0.399536 0.403277
-0.321569 0.101733 0.403477 0.406756
-0.325490 0.103851 0.407409 0.410222
-0.329412 0.105987 0.411331 0.413676
-0.333333 0.108141 0.415244 0.417117
-0.337255 0.110313 0.419147 0.420546
-0.341176 0.112503 0.423042 0.423963
-0.345098 0.114710 0.426927 0.427368
-0.349020 0.116935 0.430804 0.430762
-0.352941 0.119177 0.434672 0.434144
-0.356863 0.121437 0.438532 0.437515
-0.360784 0.123714 0.442383 0.440875
-0.364706 0.126009 0.446225 0.444224
-0.368627 0.128321 0.450060 0.447563
-0.372549 0.130650 0.453886 0.450890
-0.376471 0.132997 0.457704 0.454207
-0.380392 0.135360 0.461514 0.457514
-0.384314 0.137741 0.465317 0.460811
-0.388235 0.140139 0.469111 0.464097
-0.392157 0.142554 0.472898 0.467374
-0.396078 0.144986 0.476678 0.470641
-0.400000 0.147435 0.480450 0.473898
-0.403922 0.149900 0.484214 0.477145
-0.407843 0.152383 0.487972 0.480383
-0.411765 0.154882 0.491722 0.483612
-0.415686 0.157398 0.495465 0.486831
-0.419608 0.159931 0.499200 0.490042
-0.423529 0.162480 0.502929 0.493243
-0.427451 0.165046 0.506651 0.496436
-0.431373 0.167628 0.510366 0.499619
-0.435294 0.170227 0.514075 0.502794
-0.439216 0.172842 0.517776 0.505961
-0.443137 0.175474 0.521472 0.509119
-0.447059 0.178122 0.525160 0.512269
-0.450980 0.180787 0.528842 0.515410
-0.454902 0.183467 0.532518 0.518543
-0.458824 0.186164 0.536187 0.521668
-0.462745 0.188877 0.539850 0.524785
-0.466667 0.191606 0.543507 0.527895
-0.470588 0.194351 0.547158 0.530996
-0.474510 0.197113 0.550803 0.534090
-0.478431 0.199890 0.554441 0.537176
-0.482353 0.202684 0.558074 0.540254
-0.486275 0.205493 0.561701 0.543325
-0.490196 0.208318 0.565322 0.546388
-0.494118 0.211159 0.568937 0.549444
-0.498039 0.214016 0.572547 0.552493
-0.501961 0.216889 0.576150 0.555535
-0.505882 0.219777 0.579748 0.558569
-0.509804 0.222681 0.583341 0.561597
-0.513725 0.225601 0.586928 0.564617
-0.517647 0.228536 0.590510 0.567631
-0.521569 0.231487 0.594086 0.570638
-0.525490 0.234454 0.597657 0.573638
-0.529412 0.237436 0.601222 0.576631
-0.533333 0.240434 0.604782 0.579618
-0.537255 0.243447 0.608337 0.582598
-0.541176 0.246476 0.611887 0.585571
-0.545098 0.249520 0.615431 0.588538
-0.549020 0.252579 0.618971 0.591499
-0.552941 0.255654 0.622505 0.594453
-0.556863 0.258744 0.626035 0.597401
-0.560784 0.261849 0.629559 0.600343
-0.564706 0.264970 0.633079 0.603279
-0.568627 0.268105 0.636594 0.606208
-0.572549 0.271256 0.640103 0.609132
-0.576471 0.274422 0.643608 0.612049
-0.580392 0.277603 0.647109 0.614961
-0.584314 0.280800 0.650604 0.617867
-0.588235 0.284011 0.654095 0.620766
-0.592157 0.287237 0.657581 0.623661
-0.596078 0.290478 0.661063 0.626549
-0.600000 0.293735 0.664540 0.629431
-0.603922 0.297006 0.668012 0.632308
-0.607843 0.300292 0.671480 0.635180
-0.611765 0.303593 0.674944 0.638045
-0.615686 0.306909 0.678403 0.640906
-0.619608 0.310239 0.681857 0.643761
-0.623529 0.313585 0.685308 0.646610
-0.627451 0.316945 0.688754 0.649454
-0.631373 0.320320 0.692195 0.652293
-0.635294 0.323709 0.695633 0.655126
-0.639216 0.327114 0.699066 0.657954
-0.643137 0.330533 0.702495 0.660777
-0.647059 0.333966 0.705919 0.663595
-0.650980 0.337414 0.709340 0.666408
-0.654902 0.340877 0.712756 0.669215
-0.658824 0.344354 0.716169 0.672018
-0.662745 0.347846 0.719577 0.674816
-0.666667 0.351352 0.722981 0.677608
-0.670588 0.354873 0.726381 0.680396
-0.674510 0.358408 0.729778 0.683179
-0.678431 0.361958 0.733170 0.685957
-0.682353 0.365522 0.736559 0.688730
-0.686275 0.369100 0.739943 0.691498
-0.690196 0.372693 0.743324 0.694262
-0.694118 0.376300 0.746701 0.697021
-0.698039 0.379921 0.750074 0.699775
-0.701961 0.383557 0.753443 0.702525
-0.705882 0.387207 0.756808 0.705270
-0.709804 0.390871 0.760170 0.708010
-0.713725 0.394549 0.763528 0.710746
-0.717647 0.398242 0.766882 0.713477
-0.721569 0.401948 0.770233 0.716204
-0.725490 0.405669 0.773580 0.718927
-0.729412 0.409404 0.776923 0.721645
-0.733333 0.413153 0.780263 0.724358
-0.737255 0.416916 0.783599 0.727068
-0.741176 0.420693 0.786932 0.729773
-0.745098 0.424484 0.790261 0.732473
-0.749020 0.428289 0.793587 0.735170
-0.752941 0.432108 0.796909 0.737862
-0.756863 0.435940 0.800228 0.740550
-0.760784 0.439787 0.803543 0.743234
-0.764706 0.443648 0.806855 0.745914
-0.768627 0.447523 0.810164 0.748589
-0.772549 0.451411 0.813469 0.751261
-0.776471 0.455314 0.816770 0.753928
-0.780392 0.459230 0.820069 0.756592
-0.784314 0.463160 0.823364 0.759251
-0.788235 0.467103 0.826656 0.761906
-0.792157 0.471061 0.829944 0.764558
-0.796078 0.475032 0.833230 0.767205
-0.800000 0.479017 0.836512 0.769849
-0.803922 0.483016 0.839790 0.772489
-0.807843 0.487028 0.843066 0.775124
-0.811765 0.491054 0.846339 0.777756
-0.815686 0.495094 0.849608 0.780385
-0.819608 0.499147 0.852874 0.783009
-0.823529 0.503214 0.856137 0.785630
-0.827451 0.507294 0.859397 0.788247
-0.831373 0.511388 0.862654 0.790860
-0.835294 0.515496 0.865908 0.793469
-0.839216 0.519617 0.869158 0.796075
-0.843137 0.523751 0.872406 0.798677
-0.847059 0.527899 0.875651 0.801276
-0.850980 0.532061 0.878892 0.803871
-0.854902 0.536236 0.882131 0.806462
-0.858824 0.540424 0.885367 0.809050
-0.862745 0.544626 0.888599 0.811634
-0.866667 0.548841 0.891829 0.814215
-0.870588 0.553070 0.895056 0.816792
-0.874510 0.557311 0.898280 0.819366
-0.878431 0.561567 0.901501 0.821936
-0.882353 0.565835 0.904719 0.824503
-0.886275 0.570117 0.907935 0.827066
-0.890196 0.574412 0.911147 0.829626
-0.894118 0.578721 0.914357 0.832183
-0.898039 0.583042 0.917564 0.834736
-0.901961 0.587377 0.920768 0.837286
-0.905882 0.591725 0.923969 0.839833
-0.909804 0.596087 0.927168 0.842376
-0.913725 0.600461 0.930363 0.844916
-0.917647 0.604849 0.933556 0.847453
-0.921569 0.609249 0.936747 0.849986
-0.925490 0.613663 0.939934 0.852516
-0.929412 0.618090 0.943119 0.855044
-0.933333 0.622530 0.946301 0.857567
-0.937255 0.626984 0.949481 0.860088
-0.941176 0.631450 0.952658 0.862606
-0.945098 0.635929 0.955832 0.865120
-0.949020 0.640421 0.959003 0.867631
-0.952941 0.644927 0.962172 0.870139
-0.956863 0.649445 0.965339 0.872644
-0.960784 0.653976 0.968502 0.875146
-0.964706 0.658521 0.971664 0.877645
-0.968627 0.663078 0.974822 0.880141
-0.972549 0.667648 0.977978 0.882634
-0.976471 0.672231 0.981132 0.885124
-0.980392 0.676827 0.984283 0.887610
-0.984314 0.681436 0.987431 0.890094
-0.988235 0.686058 0.990577 0.892575
-0.992157 0.690692 0.993721 0.895053
-0.996078 0.695340 0.996862 0.897528
-1.000000 0.700000 1.000000 0.900000
-END_DATA
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-04 21:35:05 +0000