Fixed context guessing

5 files changed, 60 insertions, 100 deletions

diff --git a/Projects/mac/.DS_Store b/Projects/mac/.DS_Store
index 0d084a3..50492f8 100755
--- a/Projects/mac/.DS_Store
+++ b/Projects/mac/.DS_Store
diff --git a/Projects/mac/LittleCMS/Info.plist b/Projects/mac/LittleCMS/Info.plist
index 002d6a9..2169094 100644
--- a/Projects/mac/LittleCMS/Info.plist
+++ b/Projects/mac/LittleCMS/Info.plist
@@ -19,7 +19,7 @@
 	<key>CFBundleSignature</key>
 	<string>lcms</string>
 	<key>CFBundleVersion</key>
-	<string>2.4</string>
+	<string>2.6</string>
 	<key>CSResourcesFileMapped</key>
 	<true/>
 </dict>
diff --git a/Projects/mac/LittleCMS/LittleCMS.xcodeproj/mariama.mode1v3 b/Projects/mac/LittleCMS/LittleCMS.xcodeproj/mariama.mode1v3
index 6e34d0a..7d9477a 100644
--- a/Projects/mac/LittleCMS/LittleCMS.xcodeproj/mariama.mode1v3
+++ b/Projects/mac/LittleCMS/LittleCMS.xcodeproj/mariama.mode1v3
@@ -319,18 +319,21 @@
 							<array>
 								<string>0867D691FE84028FC02AAC07</string>
 								<string>1C37FBAC04509CD000000102</string>
+								<string>54E6DC8118AE055400445185</string>
+								<string>54E6DC8218AE055400445185</string>
 								<string>1C37FABC05509CD000000102</string>
 								<string>E2644B35053B69B200211256</string>
 							</array>
 							<key>PBXSmartGroupTreeModuleOutlineStateSelectionKey</key>
 							<array>
 								<array>
-									<integer>7</integer>
-									<integer>6</integer>
+									<integer>12</integer>
+									<integer>10</integer>
+									<integer>8</integer>
 								</array>
 							</array>
 							<key>PBXSmartGroupTreeModuleOutlineStateVisibleRectKey</key>
-							<string>{{0, 0}, {389, 946}}</string>
+							<string>{{0, 0}, {389, 899}}</string>
 						</dict>
 						<key>PBXTopSmartGroupGIDs</key>
 						<array/>
@@ -342,14 +345,14 @@
 					<key>GeometryConfiguration</key>
 					<dict>
 						<key>Frame</key>
-						<string>{{0, 0}, {406, 964}}</string>
+						<string>{{0, 0}, {406, 917}}</string>
 						<key>GroupTreeTableConfiguration</key>
 						<array>
 							<string>MainColumn</string>
 							<real>389</real>
 						</array>
 						<key>RubberWindowFrame</key>
-						<string>145 -306 1537 1005 0 0 1600 1178 </string>
+						<string>143 144 1537 958 0 0 1600 1178 </string>
 					</dict>
 					<key>Module</key>
 					<string>PBXSmartGroupTreeModule</string>
@@ -365,7 +368,7 @@
 								<key>PBXProjectModuleGUID</key>
 								<string>1CE0B20306471E060097A5F4</string>
 								<key>PBXProjectModuleLabel</key>
-								<string>testcms2.c</string>
+								<string>TestBed-Info.plist</string>
 								<key>PBXSplitModuleInNavigatorKey</key>
 								<dict>
 									<key>Split0</key>
@@ -373,21 +376,19 @@
 										<key>PBXProjectModuleGUID</key>
 										<string>1CE0B20406471E060097A5F4</string>
 										<key>PBXProjectModuleLabel</key>
-										<string>testcms2.c</string>
+										<string>TestBed-Info.plist</string>
 										<key>_historyCapacity</key>
 										<integer>0</integer>
 										<key>bookmark</key>
-										<string>54C0D5B915A2072100A94CDC</string>
+										<string>54E6DC8318AE055400445185</string>
 										<key>history</key>
 										<array>
 											<string>546B29DA10AC6B6E0054D33A</string>
-											<string>546B29F510AC6C480054D33A</string>
-											<string>54DBD07515A206A100180017</string>
+											<string>5479A29618AE035D002E61E4</string>
 										</array>
 										<key>prevStack</key>
 										<array>
 											<string>546B29E010AC6B6E0054D33A</string>
-											<string>546B29E110AC6B6E0054D33A</string>
 										</array>
 									</dict>
 									<key>SplitCount</key>
@@ -401,7 +402,7 @@
 								<key>Frame</key>
 								<string>{{0, 0}, {1126, 0}}</string>
 								<key>RubberWindowFrame</key>
-								<string>145 -306 1537 1005 0 0 1600 1178 </string>
+								<string>143 144 1537 958 0 0 1600 1178 </string>
 							</dict>
 							<key>Module</key>
 							<string>PBXNavigatorGroup</string>
@@ -421,7 +422,7 @@
 								<key>Frame</key>
 								<string>{{0, 5}, {1126, 959}}</string>
 								<key>RubberWindowFrame</key>
-								<string>145 -306 1537 1005 0 0 1600 1178 </string>
+								<string>143 144 1537 958 0 0 1600 1178 </string>
 							</dict>
 							<key>Module</key>
 							<string>XCDetailModule</string>
@@ -445,9 +446,9 @@
 			</array>
 			<key>TableOfContents</key>
 			<array>
-				<string>54C0D5B315A206F900A94CDC</string>
+				<string>54E6DC8418AE055400445185</string>
 				<string>1CE0B1FE06471DED0097A5F4</string>
-				<string>54C0D5B415A206F900A94CDC</string>
+				<string>54E6DC8518AE055400445185</string>
 				<string>1CE0B20306471E060097A5F4</string>
 				<string>1CE0B20506471E060097A5F4</string>
 			</array>
@@ -566,7 +567,7 @@
 	<key>StatusbarIsVisible</key>
 	<true/>
 	<key>TimeStamp</key>
-	<real>362940193.69248402</real>
+	<real>414057556.32574099</real>
 	<key>ToolbarDisplayMode</key>
 	<integer>1</integer>
 	<key>ToolbarIsVisible</key>
@@ -581,11 +582,10 @@
 	<integer>5</integer>
 	<key>WindowOrderList</key>
 	<array>
-		<string>546B297610AC61DD0054D33A</string>
-		<string>/Users/mariama/lcms2-2.4/Projects/mac/LittleCMS/LittleCMS.xcodeproj</string>
+		<string>/Users/mariama/lcms2-2.6rc0/Projects/mac/LittleCMS/LittleCMS.xcodeproj</string>
 	</array>
 	<key>WindowString</key>
-	<string>145 -306 1537 1005 0 0 1600 1178 </string>
+	<string>143 144 1537 958 0 0 1600 1178 </string>
 	<key>WindowToolsV3</key>
 	<array>
 		<dict>
@@ -606,7 +606,7 @@
 								<key>PBXProjectModuleGUID</key>
 								<string>1CD0528F0623707200166675</string>
 								<key>PBXProjectModuleLabel</key>
-								<string></string>
+								<string>&lt;No Editor&gt;</string>
 								<key>StatusBarVisibility</key>
 								<true/>
 							</dict>
@@ -615,7 +615,7 @@
 								<key>Frame</key>
 								<string>{{0, 0}, {897, 417}}</string>
 								<key>RubberWindowFrame</key>
-								<string>645 215 897 912 0 0 1600 1178 </string>
+								<string>645 255 897 912 0 0 1600 1178 </string>
 							</dict>
 							<key>Module</key>
 							<string>PBXNavigatorGroup</string>
@@ -641,7 +641,7 @@
 								<key>Frame</key>
 								<string>{{0, 422}, {897, 449}}</string>
 								<key>RubberWindowFrame</key>
-								<string>645 215 897 912 0 0 1600 1178 </string>
+								<string>645 255 897 912 0 0 1600 1178 </string>
 							</dict>
 							<key>Module</key>
 							<string>PBXBuildResultsModule</string>
@@ -664,14 +664,14 @@
 			<key>TableOfContents</key>
 			<array>
 				<string>546B297610AC61DD0054D33A</string>
-				<string>54C0D5B815A2071B00A94CDC</string>
+				<string>5479A28718AE031A002E61E4</string>
 				<string>1CD0528F0623707200166675</string>
 				<string>XCMainBuildResultsModuleGUID</string>
 			</array>
 			<key>ToolbarConfiguration</key>
 			<string>xcode.toolbar.config.buildV3</string>
 			<key>WindowString</key>
-			<string>645 215 897 912 0 0 1600 1178 </string>
+			<string>645 255 897 912 0 0 1600 1178 </string>
 			<key>WindowToolGUID</key>
 			<string>546B297610AC61DD0054D33A</string>
 			<key>WindowToolIsVisible</key>
@@ -706,8 +706,8 @@
 										<string>yes</string>
 										<key>sizes</key>
 										<array>
-											<string>{{0, 0}, {316, 185}}</string>
-											<string>{{316, 0}, {378, 185}}</string>
+											<string>{{0, 0}, {316, 194}}</string>
+											<string>{{316, 0}, {378, 194}}</string>
 										</array>
 									</dict>
 									<key>VerticalSplitView</key>
@@ -722,8 +722,8 @@
 										<string>yes</string>
 										<key>sizes</key>
 										<array>
-											<string>{{0, 0}, {694, 185}}</string>
-											<string>{{0, 185}, {694, 196}}</string>
+											<string>{{0, 0}, {694, 194}}</string>
+											<string>{{0, 194}, {694, 187}}</string>
 										</array>
 									</dict>
 								</dict>
@@ -756,7 +756,7 @@
 										<real>148</real>
 									</array>
 									<key>Frame</key>
-									<string>{{316, 0}, {378, 185}}</string>
+									<string>{{316, 0}, {378, 194}}</string>
 									<key>RubberWindowFrame</key>
 									<string>406 715 694 422 0 0 1600 1178 </string>
 								</dict>
@@ -784,13 +784,13 @@
 			<key>TableOfContents</key>
 			<array>
 				<string>1CD10A99069EF8BA00B06720</string>
-				<string>546B29C910AC6A970054D33A</string>
+				<string>5479A28818AE031A002E61E4</string>
 				<string>1C162984064C10D400B95A72</string>
-				<string>546B29CA10AC6A970054D33A</string>
-				<string>546B29CB10AC6A970054D33A</string>
-				<string>546B29CC10AC6A970054D33A</string>
-				<string>546B29CD10AC6A970054D33A</string>
-				<string>546B29CE10AC6A970054D33A</string>
+				<string>5479A28918AE031A002E61E4</string>
+				<string>5479A28A18AE031A002E61E4</string>
+				<string>5479A28B18AE031A002E61E4</string>
+				<string>5479A28C18AE031A002E61E4</string>
+				<string>5479A28D18AE031A002E61E4</string>
 			</array>
 			<key>ToolbarConfiguration</key>
 			<string>xcode.toolbar.config.debugV3</string>
@@ -917,8 +917,6 @@
 					<key>Dock</key>
 					<array>
 						<dict>
-							<key>BecomeActive</key>
-							<true/>
 							<key>ContentConfiguration</key>
 							<dict>
 								<key>PBXProjectModuleGUID</key>
@@ -954,7 +952,7 @@
 			<key>TableOfContents</key>
 			<array>
 				<string>1C78EAAD065D492600B07095</string>
-				<string>546B29CF10AC6A970054D33A</string>
+				<string>5479A28E18AE031A002E61E4</string>
 				<string>1C78EAAC065D492600B07095</string>
 			</array>
 			<key>ToolbarConfiguration</key>
diff --git a/Projects/mac/LittleCMS/LittleCMS.xcodeproj/mariama.pbxuser b/Projects/mac/LittleCMS/LittleCMS.xcodeproj/mariama.pbxuser
index 71ebaa9..0b057ba 100644
--- a/Projects/mac/LittleCMS/LittleCMS.xcodeproj/mariama.pbxuser
+++ b/Projects/mac/LittleCMS/LittleCMS.xcodeproj/mariama.pbxuser
@@ -4,7 +4,7 @@
 		activeArchitecture = ppc;
 		activeBuildConfigurationName = Release;
 		activeExecutable = 546B29A410AC677E0054D33A /* testbed */;
-		activeTarget = 8D07F2BC0486CC7A007CD1D0 /* LittleCMS */;
+		activeTarget = 546B29A210AC677E0054D33A /* testbed */;
 		addToTargets = (
 			546B29A210AC677E0054D33A /* testbed */,
 		);
@@ -151,18 +151,14 @@
 					PBXFileDataSource_Warnings_ColumnID,
 				);
 			};
-			PBXPerProjectTemplateStateSaveDate = 362940143;
-			PBXWorkspaceStateSaveDate = 362940143;
+			PBXPerProjectTemplateStateSaveDate = 414057556;
+			PBXWorkspaceStateSaveDate = 414057556;
 		};
 		perUserProjectItems = {
-			546B29DA10AC6B6E0054D33A = 546B29DA10AC6B6E0054D33A /* PBXTextBookmark */;
-			546B29E010AC6B6E0054D33A = 546B29E010AC6B6E0054D33A /* PBXTextBookmark */;
-			546B29E110AC6B6E0054D33A = 546B29E110AC6B6E0054D33A /* PBXTextBookmark */;
-			546B29E210AC6B6E0054D33A = 546B29E210AC6B6E0054D33A /* PBXTextBookmark */;
-			546B29F510AC6C480054D33A = 546B29F510AC6C480054D33A /* PBXTextBookmark */;
-			54C0D5B215A206F900A94CDC /* PBXTextBookmark */ = 54C0D5B215A206F900A94CDC /* PBXTextBookmark */;
-			54C0D5B915A2072100A94CDC /* PBXTextBookmark */ = 54C0D5B915A2072100A94CDC /* PBXTextBookmark */;
-			54DBD07515A206A100180017 = 54DBD07515A206A100180017 /* PBXTextBookmark */;
+			546B29DA10AC6B6E0054D33A /* PBXTextBookmark */ = 546B29DA10AC6B6E0054D33A /* PBXTextBookmark */;
+			546B29E010AC6B6E0054D33A /* PBXTextBookmark */ = 546B29E010AC6B6E0054D33A /* PBXTextBookmark */;
+			5479A29618AE035D002E61E4 /* PBXTextBookmark */ = 5479A29618AE035D002E61E4 /* PBXTextBookmark */;
+			54E6DC8318AE055400445185 /* PBXTextBookmark */ = 54E6DC8318AE055400445185 /* PBXTextBookmark */;
 		};
 		sourceControlManager = 546B292F10AC5E210054D33A /* Source Control */;
 		userBuildSettings = {
@@ -188,9 +184,9 @@
 	};
 	546B296B10AC5EAA0054D33A /* TestBed-Info.plist */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {1128, 522}}";
-			sepNavSelRange = "{172, 5}";
-			sepNavVisRange = "{0, 671}";
+			sepNavIntBoundsRect = "{{0, 0}, {1065, 336}}";
+			sepNavSelRange = "{0, 0}";
+			sepNavVisRange = "{0, 0}";
 		};
 	};
 	546B299D10AC672A0054D33A /* RunUnitTests */ = {
@@ -236,7 +232,7 @@
 	};
 	546B29AD10AC68410054D33A /* testcms2.c */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {1065, 110054}}";
+			sepNavIntBoundsRect = "{{0, 0}, {1065, 116032}}";
 			sepNavSelRange = "{0, 0}";
 			sepNavVisRange = "{0, 0}";
 			sepNavWindowFrame = "{{61, 247}, {1099, 884}}";
@@ -262,60 +258,20 @@
 		vrLen = 172;
 		vrLoc = 9140;
 	};
-	546B29E110AC6B6E0054D33A /* PBXTextBookmark */ = {
+	5479A29618AE035D002E61E4 /* PBXTextBookmark */ = {
 		isa = PBXTextBookmark;
 		fRef = 546B296B10AC5EAA0054D33A /* TestBed-Info.plist */;
 		name = "TestBed-Info.plist: 1";
 		rLen = 0;
 		rLoc = 0;
 		rType = 0;
-		vrLen = 662;
-		vrLoc = 0;
-	};
-	546B29E210AC6B6E0054D33A /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 546B29AD10AC68410054D33A /* testcms2.c */;
-		name = "testcms2.c: 1";
-		rLen = 0;
-		rLoc = 0;
-		rType = 0;
-		vrLen = 1115;
-		vrLoc = 0;
-	};
-	546B29F510AC6C480054D33A /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 546B296B10AC5EAA0054D33A /* TestBed-Info.plist */;
-		name = "TestBed-Info.plist: 5";
-		rLen = 5;
-		rLoc = 172;
-		rType = 0;
-		vrLen = 671;
-		vrLoc = 0;
-	};
-	54C0D5B215A206F900A94CDC /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 546B29AD10AC68410054D33A /* testcms2.c */;
-		name = "testcms2.c: 1";
-		rLen = 0;
-		rLoc = 0;
-		rType = 0;
-		vrLen = 0;
-		vrLoc = 0;
-	};
-	54C0D5B915A2072100A94CDC /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 546B29AD10AC68410054D33A /* testcms2.c */;
-		name = "testcms2.c: 1";
-		rLen = 0;
-		rLoc = 0;
-		rType = 0;
 		vrLen = 0;
 		vrLoc = 0;
 	};
-	54DBD07515A206A100180017 /* PBXTextBookmark */ = {
+	54E6DC8318AE055400445185 /* PBXTextBookmark */ = {
 		isa = PBXTextBookmark;
-		fRef = 546B29AD10AC68410054D33A /* testcms2.c */;
-		name = "testcms2.c: 1";
+		fRef = 546B296B10AC5EAA0054D33A /* TestBed-Info.plist */;
+		name = "TestBed-Info.plist: 1";
 		rLen = 0;
 		rLoc = 0;
 		rType = 0;
diff --git a/Projects/mac/LittleCMS/LittleCMS.xcodeproj/project.pbxproj b/Projects/mac/LittleCMS/LittleCMS.xcodeproj/project.pbxproj
index 44b52b8..b848dd7 100644
--- a/Projects/mac/LittleCMS/LittleCMS.xcodeproj/project.pbxproj
+++ b/Projects/mac/LittleCMS/LittleCMS.xcodeproj/project.pbxproj
@@ -34,8 +34,9 @@
 		546B296310AC5E600054D33A /* lcms2.h in Headers */ = {isa = PBXBuildFile; fileRef = 546B296110AC5E600054D33A /* lcms2.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		546B296410AC5E600054D33A /* lcms2_plugin.h in Headers */ = {isa = PBXBuildFile; fileRef = 546B296210AC5E600054D33A /* lcms2_plugin.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		546B29AE10AC68410054D33A /* testcms2.c in Sources */ = {isa = PBXBuildFile; fileRef = 546B29AD10AC68410054D33A /* testcms2.c */; };
-		54DBD06115A202B200180017 /* cmshalf.c in Sources */ = {isa = PBXBuildFile; fileRef = 54DBD06015A202B200180017 /* cmshalf.c */; };
 		54DBD06215A202BB00180017 /* cmshalf.c in Sources */ = {isa = PBXBuildFile; fileRef = 54DBD06015A202B200180017 /* cmshalf.c */; };
+		54E6DC7E18AE052800445185 /* testplugin.c in Sources */ = {isa = PBXBuildFile; fileRef = 54E6DC7D18AE052800445185 /* testplugin.c */; };
+		54E6DC8018AE054800445185 /* zoo_icc.c in Sources */ = {isa = PBXBuildFile; fileRef = 54E6DC7F18AE054800445185 /* zoo_icc.c */; };
 		8D07F2BE0486CC7A007CD1D0 /* LittleCMS_Prefix.pch in Headers */ = {isa = PBXBuildFile; fileRef = 32BAE0B70371A74B00C91783 /* LittleCMS_Prefix.pch */; settings = {ATTRIBUTES = (Private, ); }; };
 		8D07F2C00486CC7A007CD1D0 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 089C1666FE841158C02AAC07 /* InfoPlist.strings */; };
 		8D07F2C40486CC7A007CD1D0 /* Carbon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 08FB77AAFE841565C02AAC07 /* Carbon.framework */; };
@@ -86,6 +87,8 @@
 		546B29AC10AC682F0054D33A /* lcms2_internal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = lcms2_internal.h; path = ../../../src/lcms2_internal.h; sourceTree = SOURCE_ROOT; };
 		546B29AD10AC68410054D33A /* testcms2.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = testcms2.c; path = ../../../testbed/testcms2.c; sourceTree = SOURCE_ROOT; };
 		54DBD06015A202B200180017 /* cmshalf.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = cmshalf.c; path = ../../../src/cmshalf.c; sourceTree = "<group>"; };
+		54E6DC7D18AE052800445185 /* testplugin.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = testplugin.c; path = ../../../testbed/testplugin.c; sourceTree = SOURCE_ROOT; };
+		54E6DC7F18AE054800445185 /* zoo_icc.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = zoo_icc.c; path = ../../../testbed/zoo_icc.c; sourceTree = SOURCE_ROOT; };
 		8D07F2C70486CC7A007CD1D0 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist; path = Info.plist; sourceTree = "<group>"; };
 		8D07F2C80486CC7A007CD1D0 /* LittleCMS.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = LittleCMS.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 /* End PBXFileReference section */
@@ -121,6 +124,8 @@
 		0867D691FE84028FC02AAC07 /* LittleCMS */ = {
 			isa = PBXGroup;
 			children = (
+				54E6DC7F18AE054800445185 /* zoo_icc.c */,
+				54E6DC7D18AE052800445185 /* testplugin.c */,
 				08FB77ACFE841707C02AAC07 /* Source */,
 				089C1665FE841158C02AAC07 /* Resources */,
 				0867D69AFE84028FC02AAC07 /* External Frameworks and Libraries */,
@@ -283,7 +288,8 @@
 			buildActionMask = 2147483647;
 			files = (
 				546B29AE10AC68410054D33A /* testcms2.c in Sources */,
-				54DBD06115A202B200180017 /* cmshalf.c in Sources */,
+				54E6DC7E18AE052800445185 /* testplugin.c in Sources */,
+				54E6DC8018AE054800445185 /* zoo_icc.c in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};