Merge branch 'feature/upstream' into develop

32 files changed, 6 insertions, 4 deletions

diff --git a/target/ColorChecker.ti2 b/target/ColorChecker.ti2
index 6ede47a..6ede47a 100644..100755
--- a/target/ColorChecker.ti2
+++ b/target/ColorChecker.ti2
diff --git a/target/ECI2002.ti2 b/target/ECI2002.ti2
index 0ab3095..0ab3095 100644..100755
--- a/target/ECI2002.ti2
+++ b/target/ECI2002.ti2
diff --git a/target/ECI2002R.ti2 b/target/ECI2002R.ti2
index d3f2d8b..d3f2d8b 100644..100755
--- a/target/ECI2002R.ti2
+++ b/target/ECI2002R.ti2
diff --git a/target/FograStrip2.ti1 b/target/FograStrip2.ti1
index f8abae7..f8abae7 100644..100755
--- a/target/FograStrip2.ti1
+++ b/target/FograStrip2.ti1
diff --git a/target/FograStrip2_2.ti2 b/target/FograStrip2_2.ti2
index b84cb9d..b84cb9d 100644..100755
--- a/target/FograStrip2_2.ti2
+++ b/target/FograStrip2_2.ti2
diff --git a/target/FograStrip3.ti1 b/target/FograStrip3.ti1
index 4cf126f..4cf126f 100644..100755
--- a/target/FograStrip3.ti1
+++ b/target/FograStrip3.ti1
diff --git a/target/FograStrip3_3.ti2 b/target/FograStrip3_3.ti2
index 8f9822e..8f9822e 100644..100755
--- a/target/FograStrip3_3.ti2
+++ b/target/FograStrip3_3.ti2
diff --git a/target/Jamfile b/target/Jamfile
index 1ab2da6..07a6e5c 100644..100755
--- a/target/Jamfile
+++ b/target/Jamfile
@@ -34,6 +34,8 @@ LINKLIBS = ../xicc/libxcolorants ../spectro/libconv ../xicc/libxicc ../spectro/l
            $(TIFFLIB) $(JPEGLIB) $(PNGLIB) $(ZLIB) $(LibWin) ;
 
 
+LINKFLAGS += $(GUILINKFLAGS) ;
+
 #target generator
 Main targen : targen.c ofps.c ifarp.c simplat.c simdlat.c prand.c ;
 
diff --git a/target/License.txt b/target/License.txt
index a871fcf..a871fcf 100644..100755
--- a/target/License.txt
+++ b/target/License.txt
diff --git a/target/Readme.txt b/target/Readme.txt
index 99a8317..99a8317 100644..100755
--- a/target/Readme.txt
+++ b/target/Readme.txt
diff --git a/target/afiles b/target/afiles
index 4b06b9f..4b06b9f 100644..100755
--- a/target/afiles
+++ b/target/afiles
diff --git a/target/alphix.c b/target/alphix.c
index 6e5fc85..6e5fc85 100644..100755
--- a/target/alphix.c
+++ b/target/alphix.c
diff --git a/target/alphix.h b/target/alphix.h
index aad5b9f..aad5b9f 100644..100755
--- a/target/alphix.h
+++ b/target/alphix.h
diff --git a/target/filmtarg.c b/target/filmtarg.c
index af341dd..af341dd 100644..100755
--- a/target/filmtarg.c
+++ b/target/filmtarg.c
diff --git a/target/i1_RGB_Scan_1.4.ti2 b/target/i1_RGB_Scan_1.4.ti2
index 8aaf081..8aaf081 100644..100755
--- a/target/i1_RGB_Scan_1.4.ti2
+++ b/target/i1_RGB_Scan_1.4.ti2
diff --git a/target/ifarp.c b/target/ifarp.c
index 03fc914..03fc914 100644..100755
--- a/target/ifarp.c
+++ b/target/ifarp.c
diff --git a/target/ifarp.h b/target/ifarp.h
index ee18840..ee18840 100644..100755
--- a/target/ifarp.h
+++ b/target/ifarp.h
diff --git a/target/ofps.c b/target/ofps.c
index 5c2219c..54a0ea1 100644..100755
--- a/target/ofps.c
+++ b/target/ofps.c
@@ -108,7 +108,7 @@
 	which would probably be regarded as important.
 
 	To measure spread, independent voronoi tessellations of
-	these sub dimensions would be neededi, and they could be
+	these sub dimensions would be needed, and they could be
 	used partly driver optimization (??).
 
 	For 1D device channels this wouldn't be so hard to
@@ -1718,8 +1718,8 @@ static unsigned int comp_cmask(ofps *s, int *nix) {
 	/* the resulting location to be the same of within this. */
 	for (e = 0; e <= di; e++) {
 		int ix = nix[e];
-		if (ix < 0 && ix >= -s->nbp) {	/* If fake surface node */
-			smask |= 1 << -ix-1;
+		if (ix < 0 && ix >= (-s->nbp)) {	/* If fake surface node */
+			smask |= 1 << (-ix-1);
 		} else if (ix >= 0) {			/* If real node */
 			cmask &= s->n[ix]->pmask;
 		}
@@ -1752,7 +1752,7 @@ static void det_vtx_gsurf(ofps *s, vtx *vx) {
 	for (e = 0; e <= di; e++) {
 		int ix = vx->nix[e];
 		if (ix < 0 && ix >= -s->nbp) {	/* If fake surface node */
-			smask |= 1 << -ix-1;
+			smask |= 1 << (-ix-1);
 		} else if (ix >= 0) {
 			vx->cmask &= s->n[ix]->pmask;
 		}
diff --git a/target/ofps.h b/target/ofps.h
index 05ca121..05ca121 100644..100755
--- a/target/ofps.h
+++ b/target/ofps.h
diff --git a/target/ppoint.c b/target/ppoint.c
index 217b1e9..217b1e9 100644..100755
--- a/target/ppoint.c
+++ b/target/ppoint.c
diff --git a/target/ppoint.h b/target/ppoint.h
index 2a4bc52..2a4bc52 100644..100755
--- a/target/ppoint.h
+++ b/target/ppoint.h
diff --git a/target/prand.c b/target/prand.c
index 7ce5760..7ce5760 100644..100755
--- a/target/prand.c
+++ b/target/prand.c
diff --git a/target/prand.h b/target/prand.h
index d7e50eb..d7e50eb 100644..100755
--- a/target/prand.h
+++ b/target/prand.h
diff --git a/target/printtarg.c b/target/printtarg.c
index 1b03b3c..1b03b3c 100644..100755
--- a/target/printtarg.c
+++ b/target/printtarg.c
diff --git a/target/randix.c b/target/randix.c
index bf85764..bf85764 100644..100755
--- a/target/randix.c
+++ b/target/randix.c
diff --git a/target/randix.h b/target/randix.h
index b4c36c0..b4c36c0 100644..100755
--- a/target/randix.h
+++ b/target/randix.h
diff --git a/target/simdlat.c b/target/simdlat.c
index 50f159b..50f159b 100644..100755
--- a/target/simdlat.c
+++ b/target/simdlat.c
diff --git a/target/simdlat.h b/target/simdlat.h
index 93e0ad3..93e0ad3 100644..100755
--- a/target/simdlat.h
+++ b/target/simdlat.h
diff --git a/target/simplat.c b/target/simplat.c
index e738ff7..e738ff7 100644..100755
--- a/target/simplat.c
+++ b/target/simplat.c
diff --git a/target/simplat.h b/target/simplat.h
index 4cede20..4cede20 100644..100755
--- a/target/simplat.h
+++ b/target/simplat.h
diff --git a/target/targen.c b/target/targen.c
index 96cda6c..96cda6c 100644..100755
--- a/target/targen.c
+++ b/target/targen.c
diff --git a/target/targen.h b/target/targen.h
index c99b551..c99b551 100644..100755
--- a/target/targen.h
+++ b/target/targen.h