Imported Upstream version 1.8.3

44 files changed, 11 insertions, 11 deletions

diff --git a/profile/3dap5k.sp b/profile/3dap5k.sp
index cfbc67d..cfbc67d 100644..100755
--- a/profile/3dap5k.sp
+++ b/profile/3dap5k.sp
diff --git a/profile/CIE_C.sp b/profile/CIE_C.sp
index 8b771fe..8b771fe 100644..100755
--- a/profile/CIE_C.sp
+++ b/profile/CIE_C.sp
diff --git a/profile/D50_0.0.sp b/profile/D50_0.0.sp
index 8904fca..8904fca 100644..100755
--- a/profile/D50_0.0.sp
+++ b/profile/D50_0.0.sp
diff --git a/profile/D50_0.1.sp b/profile/D50_0.1.sp
index ad747fb..ad747fb 100644..100755
--- a/profile/D50_0.1.sp
+++ b/profile/D50_0.1.sp
diff --git a/profile/D50_0.3.sp b/profile/D50_0.3.sp
index 1a64a27..1a64a27 100644..100755
--- a/profile/D50_0.3.sp
+++ b/profile/D50_0.3.sp
diff --git a/profile/D50_0.5.sp b/profile/D50_0.5.sp
index 367d0d3..367d0d3 100644..100755
--- a/profile/D50_0.5.sp
+++ b/profile/D50_0.5.sp
diff --git a/profile/D50_0.7.sp b/profile/D50_0.7.sp
index 2e0b2e8..2e0b2e8 100644..100755
--- a/profile/D50_0.7.sp
+++ b/profile/D50_0.7.sp
diff --git a/profile/D50_1.0.sp b/profile/D50_1.0.sp
index d74e76a..d74e76a 100644..100755
--- a/profile/D50_1.0.sp
+++ b/profile/D50_1.0.sp
diff --git a/profile/D50_1.2.sp b/profile/D50_1.2.sp
index 180d650..180d650 100644..100755
--- a/profile/D50_1.2.sp
+++ b/profile/D50_1.2.sp
diff --git a/profile/D50_1.5.sp b/profile/D50_1.5.sp
index 786e292..786e292 100644..100755
--- a/profile/D50_1.5.sp
+++ b/profile/D50_1.5.sp
diff --git a/profile/D50_1.7.sp b/profile/D50_1.7.sp
index ba8dc6b..ba8dc6b 100644..100755
--- a/profile/D50_1.7.sp
+++ b/profile/D50_1.7.sp
diff --git a/profile/D50_2.0.sp b/profile/D50_2.0.sp
index efa0214..efa0214 100644..100755
--- a/profile/D50_2.0.sp
+++ b/profile/D50_2.0.sp
diff --git a/profile/D50_2.5.sp b/profile/D50_2.5.sp
index 8057f14..8057f14 100644..100755
--- a/profile/D50_2.5.sp
+++ b/profile/D50_2.5.sp
diff --git a/profile/D50_3.0.sp b/profile/D50_3.0.sp
index e68d891..e68d891 100644..100755
--- a/profile/D50_3.0.sp
+++ b/profile/D50_3.0.sp
diff --git a/profile/F1.sp b/profile/F1.sp
index 908cd72..908cd72 100644..100755
--- a/profile/F1.sp
+++ b/profile/F1.sp
diff --git a/profile/F5.sp b/profile/F5.sp
index 4959a50..4959a50 100644..100755
--- a/profile/F5.sp
+++ b/profile/F5.sp
diff --git a/profile/F8.sp b/profile/F8.sp
index f1e7beb..f1e7beb 100644..100755
--- a/profile/F8.sp
+++ b/profile/F8.sp
diff --git a/profile/GTIPlus.sp b/profile/GTIPlus.sp
index 4c4c164..4c4c164 100644..100755
--- a/profile/GTIPlus.sp
+++ b/profile/GTIPlus.sp
diff --git a/profile/Jamfile b/profile/Jamfile
index 0c857a8..0c857a8 100644..100755
--- a/profile/Jamfile
+++ b/profile/Jamfile
diff --git a/profile/License.txt b/profile/License.txt
index a871fcf..a871fcf 100644..100755
--- a/profile/License.txt
+++ b/profile/License.txt
diff --git a/profile/Office.sp b/profile/Office.sp
index 290d310..290d310 100644..100755
--- a/profile/Office.sp
+++ b/profile/Office.sp
diff --git a/profile/Readme.txt b/profile/Readme.txt
index 5fc569a..5fc569a 100644..100755
--- a/profile/Readme.txt
+++ b/profile/Readme.txt
diff --git a/profile/Trulux.sp b/profile/Trulux.sp
index fc5bb0f..fc5bb0f 100644..100755
--- a/profile/Trulux.sp
+++ b/profile/Trulux.sp
diff --git a/profile/TruluxPlus.sp b/profile/TruluxPlus.sp
index 0fd9c39..0fd9c39 100644..100755
--- a/profile/TruluxPlus.sp
+++ b/profile/TruluxPlus.sp
diff --git a/profile/afiles b/profile/afiles
index 2d91df7..2d91df7 100644..100755
--- a/profile/afiles
+++ b/profile/afiles
diff --git a/profile/applycal.c b/profile/applycal.c
index 17187db..17187db 100644..100755
--- a/profile/applycal.c
+++ b/profile/applycal.c
diff --git a/profile/cb2ti3.c b/profile/cb2ti3.c
index 4fc7866..4fc7866 100644..100755
--- a/profile/cb2ti3.c
+++ b/profile/cb2ti3.c
diff --git a/profile/colprof.c b/profile/colprof.c
index ced168b..7309dc4 100644..100755
--- a/profile/colprof.c
+++ b/profile/colprof.c
@@ -956,7 +956,7 @@ int main(int argc, char *argv[]) {
 	if (illum == icxIT_none)
 		illum = icxIT_D50;
 	
-	if (observ = icxOT_none)
+	if (observ == icxOT_none)
 		observ = icxOT_CIE_1931_2;
 
 	/* See if CIE is actually available - some sources of .TI3 don't provide it */
diff --git a/profile/colverify.c b/profile/colverify.c
index 40165a0..1ab3f64 100644..100755
--- a/profile/colverify.c
+++ b/profile/colverify.c
@@ -707,7 +707,7 @@ int main(int argc, char *argv[])
 			}
 	
 			/* Set default */
-			if (l_observ = icxOT_none)
+			if (l_observ == icxOT_none)
 				l_observ = icxOT_CIE_1931_2;
 
 			if ((sp2cie = new_xsp2cie(l_illum, l_illum == icxIT_none ? NULL : &cust_illum,
diff --git a/profile/example.sp b/profile/example.sp
index 08d836e..08d836e 100644..100755
--- a/profile/example.sp
+++ b/profile/example.sp
diff --git a/profile/example121.sp b/profile/example121.sp
index d139c38..d139c38 100644..100755
--- a/profile/example121.sp
+++ b/profile/example121.sp
diff --git a/profile/invprofcheck.c b/profile/invprofcheck.c
index 5cb1101..5cb1101 100644..100755
--- a/profile/invprofcheck.c
+++ b/profile/invprofcheck.c
diff --git a/profile/kodak2ti3.c b/profile/kodak2ti3.c
index b510719..b510719 100644..100755
--- a/profile/kodak2ti3.c
+++ b/profile/kodak2ti3.c
diff --git a/profile/ls2ti3.c b/profile/ls2ti3.c
index 3330e16..3330e16 100644..100755
--- a/profile/ls2ti3.c
+++ b/profile/ls2ti3.c
diff --git a/profile/mppcheck.c b/profile/mppcheck.c
index 6615a84..6615a84 100644..100755
--- a/profile/mppcheck.c
+++ b/profile/mppcheck.c
diff --git a/profile/mppprof.c b/profile/mppprof.c
index 41fe2fc..41fe2fc 100644..100755
--- a/profile/mppprof.c
+++ b/profile/mppprof.c
diff --git a/profile/printcal.c b/profile/printcal.c
index 9bbcb41..9bbcb41 100644..100755
--- a/profile/printcal.c
+++ b/profile/printcal.c
diff --git a/profile/prof.h b/profile/prof.h
index 013fbd6..013fbd6 100644..100755
--- a/profile/prof.h
+++ b/profile/prof.h
diff --git a/profile/profcheck.c b/profile/profcheck.c
index 8c2fc60..e3f1bec 100644..100755
--- a/profile/profcheck.c
+++ b/profile/profcheck.c
@@ -446,7 +446,7 @@ int main(int argc, char *argv[])
 	if (illum == icxIT_none)
 		illum = icxIT_D50;
 	
-	if (observ = icxOT_none)
+	if (observ == icxOT_none)
 		observ = icxOT_CIE_1931_2;
 
 	/* See if CIE is actually available - some sources of .TI3 don't provide it */
diff --git a/profile/profin.c b/profile/profin.c
index 4db596c..4db596c 100644..100755
--- a/profile/profin.c
+++ b/profile/profin.c
diff --git a/profile/profout.c b/profile/profout.c
index 1a6f4ae..4ad62aa 100644..100755
--- a/profile/profout.c
+++ b/profile/profout.c
@@ -2276,22 +2276,22 @@ make_output_icc(
 						printf("Creating Gamut Mapping\n");
 			
 					/* Gamut mapping will extend given grid res to encompas */
-					/* source gamut by a margin. */
-					if (oquality == 3) {	/* Ultra High */
-			  	 		gres = 8.0;
-			  	 		mapres = 41;
+					/* source gamut by a margin of 1.20. */
+					if (oquality == 3) {			/* Ultra High */
+			  	 		gres = 7.0;
+			  	 		mapres = 49;
 					} else if (oquality == 2) {	/* High */
 			  	 		gres = 8.0;
-			  	 		mapres = 33;
+			  	 		mapres = 39;
 					} else if (oquality == 1) {	/* Medium */
 			  	 		gres = 10.0;
-			  	 		mapres = 25;
+			  	 		mapres = 29;
 					} else if (oquality == 0) {	/* Low quality */
 			  	 		gres = 12.0;
-			  	 		mapres = 17;
+			  	 		mapres = 19;
 					} else {					/* Extremely low */
 			  	 		gres = 14.0;
-			  	 		mapres = 9;
+			  	 		mapres = 11;
 					}
 
 					/* We could lift this restriction by allowing for separate */
diff --git a/profile/simpprof.c b/profile/simpprof.c
index 61128ff..61128ff 100644..100755
--- a/profile/simpprof.c
+++ b/profile/simpprof.c
diff --git a/profile/splitti3.c b/profile/splitti3.c
index eb92938..eb92938 100644..100755
--- a/profile/splitti3.c
+++ b/profile/splitti3.c
diff --git a/profile/txt2ti3.c b/profile/txt2ti3.c
index 28f5071..28f5071 100644..100755
--- a/profile/txt2ti3.c
+++ b/profile/txt2ti3.c