Address reviews.

xamarin · Aug 31, 2021 · 6111f8d · 6111f8d
1 parent e4f3c47
commit 6111f8d
Show file tree

Hide file tree

Showing 7 changed files with 34 additions and 26 deletions.
diff --git a/src/CoreGraphics/CGColorSpace.cs b/src/CoreGraphics/CGColorSpace.cs
@@ -86,24 +86,6 @@ public CGColorSpace (CFPropertyList propertyList)
 			this.handle = CGColorSpaceCreateWithPropertyList (propertyList.Handle);
 		}
 
-#if !NET
-		[Mac (12,0), iOS (15,0), TV (15,0), Watch (8,0), MacCatalyst (15,0)]
-#else
-		[SupportedOSPlatform ("ios15.0"), SupportedOSPlatform ("tvos15.0"), SupportedOSPlatform ("macos12.0"), SupportedOSPlatform ("maccatalyst15.0")]
-#endif
-		[DllImport (Constants.CoreGraphicsLibrary)]
-		static extern IntPtr CGColorSpaceCreateWithColorSyncProfile (/*[NullAllowed] ColorSyncProfileRef */ IntPtr profile, /*[NullAllowed] CFDictionaryRef */ IntPtr options);
-
-#if !NET
-		[Mac (12,0), iOS (15,0), TV (15,0), Watch (8,0), MacCatalyst (15,0)]
-#else
-		[SupportedOSPlatform ("ios15.0"), SupportedOSPlatform ("tvos15.0"), SupportedOSPlatform ("macos12.0"), SupportedOSPlatform ("maccatalyst15.0")]
-#endif
-		public CGColorSpace (IntPtr? profile, NSDictionary options)
-		{
-			this.handle = CGColorSpaceCreateWithColorSyncProfile (profile ?? IntPtr.Zero, options.GetHandle ());
-		}
-
 		[Preserve (Conditional=true)]
 		internal CGColorSpace (IntPtr handle, bool owns)
 		{

diff --git a/src/CoreGraphics/CGDisplay.cs b/src/CoreGraphics/CGDisplay.cs
@@ -9,9 +9,9 @@ namespace CoreGraphics
 {
 
 #if !NET
-		[MacCatalyst (15,0)]
+	[MacCatalyst (15,0)]
 #else
-		[SupportedOSPlatform ("maccatalyst15.0")]
+	[SupportedOSPlatform ("maccatalyst15.0")]
 #endif
 	public enum CGCaptureOptions : uint
 	{
@@ -20,9 +20,9 @@ public enum CGCaptureOptions : uint
 	}
 
 #if !NET
-		[MacCatalyst (15,0)]
+	[MacCatalyst (15,0)]
 #else
-		[SupportedOSPlatform ("maccatalyst15.0")]
+	[SupportedOSPlatform ("maccatalyst15.0")]
 #endif
 	public static class CGDisplay
 	{

diff --git a/src/CoreGraphics/CGEvent.cs b/src/CoreGraphics/CGEvent.cs
@@ -23,9 +23,9 @@
 namespace CoreGraphics {
 
 #if !NET
-		[MacCatalyst (15,0)]
+	[MacCatalyst (15,0)]
 #else
-		[SupportedOSPlatform ("maccatalyst15.0")]
+	[SupportedOSPlatform ("maccatalyst15.0")]
 #endif
 	public sealed class CGEvent : IDisposable, INativeObject {
 		public delegate IntPtr CGEventTapCallback (IntPtr tapProxyEvent, CGEventType eventType, IntPtr eventRef, IntPtr userInfo);

diff --git a/src/coregraphics.cs b/src/coregraphics.cs
@@ -289,7 +289,7 @@ interface CGColorSpaceNames {
 
 		[Mac (12, 0), iOS (15, 0), TV (15,0), Watch (8,0), MacCatalyst (15,0)]
 		[Field ("kCGColorSpaceLinearITUR_2020")]
-		NSString LinearITUR_2020 { get; }
+		NSString LinearItur_2020 { get; }
 	}
 
 	[Partial]

diff --git a/tests/monotouch-test/CoreGraphics/ColorSpaceTest.cs b/tests/monotouch-test/CoreGraphics/ColorSpaceTest.cs
@@ -445,5 +445,28 @@ public void CreateExtendedLinearizedTest ()
 				Assert.That ((nint) TestRuntime.CFGetRetainCount (csl.Handle), Is.EqualTo ((nint) 1));
 			}
 		}
+
+		[Test]
+		public void IsHlgBasedTest ()
+		{
+			TestRuntime.AssertXcodeVersion (13,0);
+			using (var cs = CGColorSpace.CreateDeviceRGB ()) {
+				Assert.DoesNotThrow (() => {
+					var result = cs.IsHlgBased;
+				});
+			}
+		}
+
+		[Test]
+		public void IsPQBasedTest ()
+		{
+			TestRuntime.AssertXcodeVersion (13,0);
+			using (var cs = CGColorSpace.CreateDeviceRGB ()) {
+				Assert.DoesNotThrow (() => {
+					var result = cs.IsPQBased;
+				});
+			}
+		}
 	}
+
 }
diff --git a/tests/xtro-sharpie/MacCatalyst-CoreGraphics.ignore b/tests/xtro-sharpie/MacCatalyst-CoreGraphics.ignore
@@ -1,4 +1,4 @@
-# ignored in macOs too
+# ignored in macOS too
 !missing-enum! CGConfigureOption not bound
 !missing-enum! CGDisplayChangeSummaryFlags not bound
 !missing-enum! CGDisplayStreamFrameStatus not bound

diff --git a/tests/xtro-sharpie/common-CoreGraphics.ignore b/tests/xtro-sharpie/common-CoreGraphics.ignore
@@ -7,6 +7,9 @@
 # There's an identical function that takes a C callback instead of a block, and which we've bound, which makes this function redundant since the managed API would be identical.
 !missing-pinvoke! CGPDFDictionaryApplyBlock is not bound
 
+# not yet sure how to bind this
+!missing-pinvoke! CGColorSpaceCreateWithColorSyncProfile is not bound
+
 ## unsorted
 
 !missing-enum! CGBitmapInfo not bound