Merge branch 'feature/upstream' into develop

3 files changed, 70 insertions, 75 deletions

diff --git a/debian/patches/0001_jam.patch b/debian/patches/0001_jam.patch
index b0469f3..976f485 100644
--- a/debian/patches/0001_jam.patch
+++ b/debian/patches/0001_jam.patch
@@ -8,7 +8,7 @@ Index: trunk/Jambase
 ===================================================================
 --- trunk.orig/Jambase
 +++ trunk/Jambase
-@@ -941,7 +941,7 @@ else if $(UNIX)
+@@ -945,7 +945,7 @@ else if $(UNIX)
  
  	# UNIX defaults
  
@@ -17,7 +17,7 @@ Index: trunk/Jambase
  	CCOPTFLAG		?= -O2 ;		
  	CCDEBUGFLAG		?= -g ;		
  	CCPROFFLAG		?= ;		
-@@ -951,7 +951,7 @@ else if $(UNIX)
+@@ -955,7 +955,7 @@ else if $(UNIX)
  	CHGRP			?= chgrp ;
  	CHOWN			?= chown ;
  	LEX				?= lex ;
@@ -26,7 +26,7 @@ Index: trunk/Jambase
  	LINKOPTFLAG		?= -O ;				# Affects creating .so's
  	LINKSTRIPFLAG	?= -s ;
  	LINKDEBUGFLAG	?= ;
-@@ -1037,7 +1037,7 @@ else if $(UNIX)
+@@ -1041,7 +1041,7 @@ else if $(UNIX)
  	RMDIR			?= $(RM) ;
  	RSH				?= rsh ;
  	SED				?= sed ;
diff --git a/debian/patches/0100_spelling.patch b/debian/patches/0100_spelling.patch
index 9797224..04dc5e9 100644
--- a/debian/patches/0100_spelling.patch
+++ b/debian/patches/0100_spelling.patch
@@ -41,7 +41,7 @@ Index: trunk/spectro/dispcal.c
  				comport = atoi(na);
  				if (comport < 1 || comport > 50) usage(0,"-c parameter %d out of range",comport);
  
-@@ -3111,7 +3111,7 @@ int main(int argc, char *argv[]) {
+@@ -3114,7 +3114,7 @@ int main(int argc, char *argv[]) {
  			/* Black level adjustment */
  			/* Due to the possibility of the channel offsets not being even, */
  			/* we use the largest of the XYZ values after they have been */
@@ -54,7 +54,7 @@ Index: trunk/spectro/spotread.c
 ===================================================================
 --- trunk.orig/spectro/spotread.c
 +++ trunk/spectro/spotread.c
-@@ -509,7 +509,7 @@ int main(int argc, char *argv[]) {
+@@ -517,7 +517,7 @@ int main(int argc, char *argv[]) {
  			/* COM port  */
  			} else if (argv[fa][1] == 'c') {
  				fa = nfa;
@@ -63,16 +63,16 @@ Index: trunk/spectro/spotread.c
  				{
  					comport = atoi(na);
  					if (comport < 1 || comport > 40) usage("-c parameter %d out of range",comport);
-@@ -518,7 +518,7 @@ int main(int argc, char *argv[]) {
+@@ -526,7 +526,7 @@ int main(int argc, char *argv[]) {
  			/* Display type */
  			} else if (argv[fa][1] == 'y') {
  				fa = nfa;
 -				if (na == NULL) usage("Paramater expected following -y");
 +				if (na == NULL) usage("Parameter expected following -y");
- 				dtype = na[0];
- 
- #ifndef SALONEINSTLIB
-@@ -526,7 +526,7 @@ int main(int argc, char *argv[]) {
+ 				ditype = na[0];
+ 				if (ditype == '_' && na[1] != '\000')
+ 					ditype = ditype << 8 | na[1];
+@@ -536,7 +536,7 @@ int main(int argc, char *argv[]) {
  			} else if (argv[fa][1] == 'I') {
  
  				fa = nfa;
@@ -81,7 +81,7 @@ Index: trunk/spectro/spotread.c
  				if (strcmp(na, "A") == 0
  				 || strcmp(na, "M0") == 0) {
  					tillum_set = spec = 1;
-@@ -574,7 +574,7 @@ int main(int argc, char *argv[]) {
+@@ -584,7 +584,7 @@ int main(int argc, char *argv[]) {
  			/* Spectral Illuminant type for XYZ computation */
  			} else if (argv[fa][1] == 'i') {
  				fa = nfa;
@@ -90,7 +90,7 @@ Index: trunk/spectro/spotread.c
  				if (strcmp(na, "A") == 0) {
  					illum_set = spec = 1;
  					illum = icxIT_A;
-@@ -623,7 +623,7 @@ int main(int argc, char *argv[]) {
+@@ -639,7 +639,7 @@ int main(int argc, char *argv[]) {
  			/* Spectral Observer type */
  			} else if (argv[fa][1] == 'Q') {
  				fa = nfa;
@@ -99,7 +99,7 @@ Index: trunk/spectro/spotread.c
  				if (strcmp(na, "1931_2") == 0) {			/* Classic 2 degree */
  					obType = icxOT_CIE_1931_2;
  				} else if (strcmp(na, "1964_10") == 0) {	/* Classic 10 degree */
-@@ -712,7 +712,7 @@ int main(int argc, char *argv[]) {
+@@ -728,7 +728,7 @@ int main(int argc, char *argv[]) {
  			/* Filter configuration */
  			} else if (argv[fa][1] == 'F') {
  				fa = nfa;
@@ -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')
-@@ -727,13 +727,13 @@ int main(int argc, char *argv[]) {
+@@ -743,13 +743,13 @@ int main(int argc, char *argv[]) {
  			/* Extra filter compensation file */
  			} else if (argv[fa][1] == 'E') {
  				fa = nfa;
@@ -124,7 +124,7 @@ Index: trunk/spectro/spotread.c
  				if (na[0] == 'N')
  					calstd = xcalstd_none;
  				else if (na[0] == 'A')
-@@ -743,7 +743,7 @@ int main(int argc, char *argv[]) {
+@@ -759,7 +759,7 @@ int main(int argc, char *argv[]) {
  				else if (na[0] == 'G')
  					calstd = xcalstd_gmdi;
  				else
@@ -133,7 +133,7 @@ Index: trunk/spectro/spotread.c
  
  			/* Show Yxy */
  			} else if (argv[fa][1] == 'x') {
-@@ -1479,7 +1479,7 @@ int main(int argc, char *argv[]) {
+@@ -1513,7 +1513,7 @@ int main(int argc, char *argv[]) {
  
  		/* Or something is wrong with instrument capabilities */
  		} else {
@@ -159,7 +159,7 @@ Index: trunk/spectro/dispwin.c
 ===================================================================
 --- trunk.orig/spectro/dispwin.c
 +++ trunk/spectro/dispwin.c
-@@ -5234,7 +5234,7 @@ int ddebug						/* >0 to print debug sta
+@@ -5238,7 +5238,7 @@ int ddebug						/* >0 to print debug sta
  		vinfo = XGetVisualInfo(p->mydisplay, VisualIDMask, &template, &nitems); 
  
  		if (nitems < 1) {
@@ -242,7 +242,7 @@ Index: trunk/spectro/i1pro_imp.c
 ===================================================================
 --- trunk.orig/spectro/i1pro_imp.c
 +++ trunk/spectro/i1pro_imp.c
-@@ -2701,7 +2701,7 @@ int *pinstmsec) {	/* Return instrument l
+@@ -2780,7 +2780,7 @@ int *pinstmsec) {	/* Return instrument l
  			break;
  	}
  
@@ -251,7 +251,7 @@ Index: trunk/spectro/i1pro_imp.c
  
  	/* Compute overall delay */
  	dispmsec = (int)(samp[i].sec * 1000.0 + 0.5);				/* Display update time */
-@@ -3154,7 +3154,7 @@ i1pro_code i1pro_imp_measure(
+@@ -3233,7 +3233,7 @@ i1pro_code i1pro_imp_measure(
  		}
  	}
  	
@@ -260,7 +260,7 @@ Index: trunk/spectro/i1pro_imp.c
  	if (user_trig)
  		return I1PRO_USER_TRIG;
  	return ev; 
-@@ -3816,7 +3816,7 @@ i1pro_code i1pro_imp_meas_refrate(
+@@ -3895,7 +3895,7 @@ i1pro_code i1pro_imp_meas_refrate(
  			}
  		}
  	} else {
@@ -269,7 +269,7 @@ Index: trunk/spectro/i1pro_imp.c
  	}
  
  	return I1PRO_RD_NOREFR_FOUND; 
-@@ -3911,7 +3911,7 @@ i1pro_code i1pro_restore_refspot_cal(i1p
+@@ -3990,7 +3990,7 @@ i1pro_code i1pro_restore_refspot_cal(i1p
  		return I1PRO_OK;
  	}
  
@@ -278,7 +278,7 @@ Index: trunk/spectro/i1pro_imp.c
  	s->dark_valid = 1;
  	s->ddate = m->caldate;
  
-@@ -3956,7 +3956,7 @@ i1pro_code i1pro_restore_refspot_cal(i1p
+@@ -4035,7 +4035,7 @@ i1pro_code i1pro_restore_refspot_cal(i1p
  		return I1PRO_OK;
  	}
  
@@ -287,7 +287,7 @@ Index: trunk/spectro/i1pro_imp.c
  	s->cal_valid = 1;
  	s->cfdate = m->caldate;
  
-@@ -4312,7 +4312,7 @@ i1pro_code i1pro_save_calibration(i1pro
+@@ -4391,7 +4391,7 @@ i1pro_code i1pro_save_calibration(i1pro
  		write_doubles(&x, fp, s->idark_data[3]-1, m->nraw+1);
  	}
  
@@ -313,7 +313,7 @@ Index: trunk/spectro/ss.c
 ===================================================================
 --- trunk.orig/spectro/ss.c
 +++ trunk/spectro/ss.c
-@@ -375,7 +375,7 @@ ss_init_coms(inst *pp, baud_rate br, flo
+@@ -376,7 +376,7 @@ ss_init_coms(inst *pp, baud_rate br, flo
  
  	p->gotcoms = 1;
  
@@ -322,7 +322,7 @@ Index: trunk/spectro/ss.c
  
  	return inst_ok;
  }
-@@ -1744,7 +1744,7 @@ ss_interp_error(inst *pp, int ec) {
+@@ -1745,7 +1745,7 @@ ss_interp_error(inst *pp, int ec) {
  		case ss_et_FilterOutOfPos:
  			return "Filter wheel out of position";
  		case ss_et_SendTimeout:
@@ -331,7 +331,7 @@ Index: trunk/spectro/ss.c
  		case ss_et_DriveError:
  			return "Data drive defect";
  		case ss_et_MeasDisabled:
-@@ -1864,7 +1864,7 @@ ss_interp_error(inst *pp, int ec) {
+@@ -1865,7 +1865,7 @@ ss_interp_error(inst *pp, int ec) {
  		case ss_et_BadHexEncoding:
  			return "Message received from instrument has bad Hex encoding";
  		case ss_et_RecBufferOverun:
@@ -370,7 +370,7 @@ Index: trunk/xicc/cv.c
 ===================================================================
 --- trunk.orig/xicc/cv.c
 +++ trunk/xicc/cv.c
-@@ -101,7 +101,7 @@ main(int argc, char *argv[]) {
+@@ -102,7 +102,7 @@ main(int argc, char *argv[]) {
  
  	printf("There are %d parameters:\n",np); fflush(stdout);
  	for (i = 0; i < np; i++) {
@@ -667,34 +667,7 @@ Index: trunk/link/collink.c
 ===================================================================
 --- trunk.orig/link/collink.c
 +++ trunk/link/collink.c
-@@ -1122,7 +1122,7 @@ void devip_devop(void *cntx, double *out
- 			}
- 			/* We've got the input profile PCS' at this point. */
- 
--			/* If we're transfering the K value from the input profile to the */
-+			/* If we're transferring the K value from the input profile to the */
- 			/* 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. */  
-@@ -1204,7 +1204,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);
- 			}
-@@ -1254,7 +1254,7 @@ void devip_devop(void *cntx, double *out
- 		if (p->nhack == 2) {
- 			/* Ideally we would create a 4D PCSK -> PCSK gamut mapping */
- 			/* to smoothly and accurately cope with the changing source */
--			/* and destination gamuts acording to their degree of "K onlyness". */
-+			/* and destination gamuts according to their degree of "K onlyness". */
- 			/* In practice we're going to simply interpolated between */
- 			/* two extremes: unrestricted gamut and K only black gamut. */
- 			double map0[3], map1[3];
-@@ -4807,7 +4807,7 @@ main(int argc, char *argv[]) {
+@@ -4899,7 +4899,7 @@ main(int argc, char *argv[]) {
  		}
  
  		if (li.verb)
@@ -720,7 +693,7 @@ Index: trunk/spectro/dispsup.c
 ===================================================================
 --- trunk.orig/spectro/dispsup.c
 +++ trunk/spectro/dispsup.c
-@@ -721,7 +721,7 @@ static int disprd_read_imp(
+@@ -722,7 +722,7 @@ static int disprd_read_imp(
  		scb->serno = p->serno++;
  		scb->msec = msec_time();
  
@@ -729,7 +702,7 @@ Index: trunk/spectro/dispsup.c
  		                val.XYZ[0], val.XYZ[1], val.XYZ[2]);
  
  		scb->mtype = val.mtype;
-@@ -1241,7 +1241,7 @@ int disprd_ambient(
+@@ -1242,7 +1242,7 @@ int disprd_ambient(
  
  	/* Or something is wrong with instrument capabilities */
  	} else {
@@ -738,7 +711,7 @@ Index: trunk/spectro/dispsup.c
  		return 2;
  	}
  
-@@ -2344,7 +2344,7 @@ static int config_inst_displ(disprd *p)
+@@ -2346,7 +2346,7 @@ static int config_inst_displ(disprd *p)
  	/* Reset key meanings */
  	inst_reset_uih();
  
@@ -751,7 +724,7 @@ Index: trunk/gamut/gammap.c
 ===================================================================
 --- trunk.orig/gamut/gammap.c
 +++ trunk/gamut/gammap.c
-@@ -859,7 +859,7 @@ gammap *new_gammap(
+@@ -861,7 +861,7 @@ gammap *new_gammap(
  #endif
  			if (gmi->bph == gmm_clipBP) {
  
@@ -764,7 +737,7 @@ Index: trunk/profile/profout.c
 ===================================================================
 --- trunk.orig/profile/profout.c
 +++ trunk/profile/profout.c
-@@ -1104,7 +1104,7 @@ make_output_icc(
+@@ -1105,7 +1105,7 @@ make_output_icc(
  		if (iccver < icmVersion2_4) {
  			iccver = icmVersion2_4;		/* Need 2.4.0 for Display intents */
  			if (verb)
@@ -790,7 +763,7 @@ Index: trunk/xicc/xspect.c
 ===================================================================
 --- trunk.orig/xicc/xspect.c
 +++ trunk/xicc/xspect.c
-@@ -4454,7 +4454,7 @@ void xspect_plot10p(xspect *sp[10], int
+@@ -4509,7 +4509,7 @@ void xspect_plotNp(xspect *sp[MXGPHS], i
  /* Given an emission spectrum, set the UV output to the given level. */
  /* The shape of the UV is taken from FWA1_stim, and the level is */
  /* with respect to the Y of the input spectrum. */
@@ -812,7 +785,7 @@ Index: trunk/spectro/ccxxmake.c
  				comno = atoi(na);
  				if (comno < 1 || comno > 40) usage(0,"-c parameter %d out of range",comno);
  
-@@ -508,7 +508,7 @@ int main(int argc, char *argv[]) {
+@@ -510,7 +510,7 @@ int main(int argc, char *argv[]) {
  			/* Serial port flow control */
  			} else if (argv[fa][1] == 'W') {
  				fa = nfa;
@@ -821,7 +794,7 @@ Index: trunk/spectro/ccxxmake.c
  				if (na[0] == 'n' || na[0] == 'N')
  					fc = fc_None;
  				else if (na[0] == 'h' || na[0] == 'H')
-@@ -597,7 +597,7 @@ int main(int argc, char *argv[]) {
+@@ -599,7 +599,7 @@ int main(int argc, char *argv[]) {
  		strcat(outname, doccss ? ".ccss" : ".ccmx");
  
  	if (fakeseq && doccss)
@@ -830,7 +803,7 @@ Index: trunk/spectro/ccxxmake.c
  
  	printf("\n");
  
-@@ -813,7 +813,7 @@ int main(int argc, char *argv[]) {
+@@ -815,7 +815,7 @@ int main(int argc, char *argv[]) {
  						refs[i][2] = cols[i][2];
  					}
  					gotref = 1;
@@ -1298,7 +1271,7 @@ Index: trunk/xicc/mpp.c
 ===================================================================
 --- trunk.orig/xicc/mpp.c
 +++ trunk/xicc/mpp.c
-@@ -733,7 +733,7 @@ int           use_fwa			/* NZ to involke
+@@ -735,7 +735,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))
@@ -1324,7 +1297,7 @@ Index: trunk/target/ofps.c
 ===================================================================
 --- trunk.orig/target/ofps.c
 +++ trunk/target/ofps.c
-@@ -2612,7 +2612,7 @@ static int position_vtx(
+@@ -2613,7 +2613,7 @@ static int position_vtx(
  					if (tries > s->maxretries)
  						s->maxretries = tries;
  #ifdef DEBUG
@@ -1333,7 +1306,7 @@ Index: trunk/target/ofps.c
  					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(
+@@ -2628,7 +2628,7 @@ static int position_vtx(
  
  #ifdef DUMP_FERR 		/* Create .tiff of dnsq function error */
  					if (tries >= DUMP_FERR) {
@@ -1342,7 +1315,7 @@ Index: trunk/target/ofps.c
  
  						/* 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
+@@ -6222,7 +6222,7 @@ static int ofps_findhit_vtxs(ofps *s, no
  	int hit = 0;
  
  	if (nn->ix < 0)
@@ -1351,7 +1324,7 @@ Index: trunk/target/ofps.c
  
  #ifdef DEBUG
  	if (s->agrid_init == 0)
-@@ -8023,7 +8023,7 @@ ofps *s
+@@ -8024,7 +8024,7 @@ ofps *s
  			warning("Verify of incremental vertexes failed!");
  			printf("Verify of incremental vertexes failed!\n");
  		} else {
@@ -1360,7 +1333,7 @@ Index: trunk/target/ofps.c
  		}
  #ifdef DUMP_STRUCTURE
  		dump_node_vtxs(s, 1);
-@@ -8443,7 +8443,7 @@ int nopstop				/* Debug - number of opti
+@@ -8444,7 +8444,7 @@ int nopstop				/* Debug - number of opti
  		fprintf(stderr,"Average dnsqs/position = %.2f\n",s->dnsqs/(double)s->positions); 
  		fprintf(stderr,"Average function calls/dnsq = %.1f\n",s->funccount/(double)s->dnsqs); 
  		fprintf(stderr,"Maximum function calls/dnsq = %d\n",s->maxfunc); 
@@ -1412,6 +1385,15 @@ Index: trunk/spectro/smcube.c
  
  	p->gotcoms = 1;
  
+@@ -768,7 +768,7 @@ smcube_interp_error(inst *pp, int ec) {
+ 		case SMCUBE_INT_THREADFAILED:
+ 			return "Starting diffuser position thread failed";
+ 		case SMCUBE_INT_ILL_WRITE:
+-			return "Attemp to write to factory calibration";
++			return "Attempt to write to factory calibration";
+ 		case SMCUBE_INT_WHITE_CALIB:
+ 			return "No valid white calibration";
+ 		case SMCUBE_INT_BLACK_CALIB:
 @@ -1248,7 +1248,7 @@ smcube_get_idle_time(smcube *p, int *pit
  	itime = read_ORD16_be(buf + 4);
  
@@ -1457,7 +1439,7 @@ Index: trunk/spectro/kleink10.c
 ===================================================================
 --- trunk.orig/spectro/kleink10.c
 +++ trunk/spectro/kleink10.c
-@@ -729,7 +729,7 @@ int ix					/* Klein calibration index 1
+@@ -730,7 +730,7 @@ int ix					/* Klein calibration index 1
  
  	if (buf[0] != 'D' || buf[1] != '1') {
  		amutex_unlock(p->lock);
@@ -1466,7 +1448,7 @@ Index: trunk/spectro/kleink10.c
  		return inst_protocol_error;
  	}
  
-@@ -2068,7 +2068,7 @@ int *pinstmsec) {	/* Return instrument r
+@@ -2077,7 +2077,7 @@ int *pinstmsec) {	/* Return instrument r
  			break;
  	}
  
@@ -1570,7 +1552,7 @@ Index: trunk/spectro/specbos.c
  
  	/* See if it's a 1501 or 1511 */
  	if (p->model == 1501) {
-@@ -1669,7 +1669,7 @@ char id[CALIDLEN]		/* Condition identifi
+@@ -1693,7 +1693,7 @@ char id[CALIDLEN]		/* Condition identifi
  	if ((ev = specbos_get_n_a_cals((inst *)p, &needed, &available)) != inst_ok)
  		return ev;
  
@@ -1583,7 +1565,7 @@ Index: trunk/plot/plot.c
 ===================================================================
 --- trunk.orig/plot/plot.c
 +++ trunk/plot/plot.c
-@@ -2459,7 +2459,7 @@ static void dprintf(char *fmt, ...) {
+@@ -2521,7 +2521,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)) {
@@ -1718,3 +1700,16 @@ Index: trunk/spectro/munki_imp.h
  #define MUNKI_INT_CAL_SAVE              0x65		/* Unable to save calibration to file */
  #define MUNKI_INT_CAL_RESTORE           0x66		/* Unable to restore calibration from file */
  #define MUNKI_INT_CAL_TOUCH             0x67        /* Unable to touch calibration file */
+Index: trunk/spectro/spec2cie.c
+===================================================================
+--- trunk.orig/spectro/spec2cie.c
++++ trunk/spectro/spec2cie.c
+@@ -215,7 +215,7 @@ main(int argc, char *argv[])
+ 					calstdi = xcalstd_gmdi;
+ 					calstdo = xcalstd_xrdi;
+ 				} else {
+-					//usage("Paramater after -A '%c%c' not recognized",na[0],na[1]);
++					//usage("Parameter after -A '%c%c' not recognized",na[0],na[1]);
+ 					usage();
+ 				}
+ 			}
diff --git a/debian/patches/0105_dispwin_segfault.patch b/debian/patches/0105_dispwin_segfault.patch
index 3ead582..d69d9d6 100644
--- a/debian/patches/0105_dispwin_segfault.patch
+++ b/debian/patches/0105_dispwin_segfault.patch
@@ -10,7 +10,7 @@ Index: trunk/spectro/dispwin.c
 ===================================================================
 --- trunk.orig/spectro/dispwin.c
 +++ trunk/spectro/dispwin.c
-@@ -6277,6 +6277,7 @@ main(int argc, char *argv[]) {
+@@ -6281,6 +6281,7 @@ main(int argc, char *argv[]) {
  
  			/* Display number */
  			else if (argv[fa][1] == 'd') {