[CoreImage] Implement Xcode 16 beta 6 changes. (#21117)

Also some xtro cleanup.
xamarin · Sep 5, 2024 · f61f129 · f61f129
1 parent 9edb314
commit f61f129
Show file tree

Hide file tree

Showing 13 changed files with 29 additions and 38 deletions.
diff --git a/src/coreimage.cs b/src/coreimage.cs
@@ -1531,8 +1531,17 @@ interface CIFilterApply {
  NSString OptionColorSpace { get; }
  }
 
+#if XAMCORE_5_0
+ [NoiOS]
+ [NoMacCatalyst]
+#else
+#if __IOS__ || __MACCATALYST__
+ [EditorBrowsable (EditorBrowsableState.Never)]
+ [Obsolete ("Do not use; this type does not exist on this platform.")]
+#endif
  [iOS (17, 0)]
  [MacCatalyst (17, 0)]
+#endif
  [NoWatch]
  [NoTV]
  [BaseType (typeof (NSObject))]
@@ -6517,6 +6526,10 @@ partial interface CIImageRepresentationKeys {
  [Field ("kCIImageContentHeadroom")]
  NSString ContentHeadroom { get; }
 
+ [TV (18, 0), Mac (15, 0), iOS (18, 0), MacCatalyst (18, 0)]
+ [Field ("kCIImageRepresentationHDRGainMapImage")]
+ NSString HdrGainMapImage { get; }
+
  }
 
  [MacCatalyst (13, 1)]

diff --git a/tests/xtro-sharpie/api-annotations-dotnet/MacCatalyst-CoreImage.ignore b/tests/xtro-sharpie/api-annotations-dotnet/MacCatalyst-CoreImage.ignore
@@ -0,0 +1,2 @@
+# removed in XAMCORE_5_0
+!unknown-type! CIFilterGenerator bound
diff --git a/tests/xtro-sharpie/api-annotations-dotnet/MacCatalyst-CoreImage.todo b/tests/xtro-sharpie/api-annotations-dotnet/MacCatalyst-CoreImage.todo
diff --git a/tests/xtro-sharpie/api-annotations-dotnet/common-CoreImage.ignore b/tests/xtro-sharpie/api-annotations-dotnet/common-CoreImage.ignore
@@ -259,3 +259,8 @@
 !incorrect-protocol-member! CIPhotoEffect::extrapolate is REQUIRED and should be abstract
 !incorrect-protocol-member! CIImageProcessorInput::roiTileCount is REQUIRED and should be abstract
 !incorrect-protocol-member! CIImageProcessorInput::roiTileIndex is REQUIRED and should be abstract
+# xcode 16
+!missing-selector! +CIFilter::areaAlphaWeightedHistogramFilter not bound
+!missing-selector! +CIFilter::areaBoundsRedFilter not bound
+!missing-selector! +CIFilter::maximumScaleTransformFilter not bound
+!missing-selector! +CIFilter::toneMapHeadroomFilter not bound
diff --git a/tests/xtro-sharpie/api-annotations-dotnet/iOS-CoreImage.ignore b/tests/xtro-sharpie/api-annotations-dotnet/iOS-CoreImage.ignore
@@ -1,3 +1,5 @@
 ## OSX-only API, rdar #22524785
 ## see https://trello.com/c/kpksFWto/6-22524785-coreimage-headers-discrepancies
 !missing-selector! CIKernel::setROISelector: not bound
+# removed in XAMCORE_5_0
+!unknown-type! CIFilterGenerator bound
diff --git a/tests/xtro-sharpie/api-annotations-dotnet/iOS-CoreImage.todo b/tests/xtro-sharpie/api-annotations-dotnet/iOS-CoreImage.todo
diff --git a/tests/xtro-sharpie/api-annotations-dotnet/macOS-CoreImage.todo b/tests/xtro-sharpie/api-annotations-dotnet/macOS-CoreImage.todo
diff --git a/tests/xtro-sharpie/api-annotations-dotnet/tvOS-CoreImage.todo b/tests/xtro-sharpie/api-annotations-dotnet/tvOS-CoreImage.todo
diff --git a/tests/xtro-sharpie/common-CoreImage.ignore b/tests/xtro-sharpie/common-CoreImage.ignore
@@ -261,3 +261,8 @@
 !incorrect-protocol-member! CIPhotoEffect::extrapolate is REQUIRED and should be abstract
 !incorrect-protocol-member! CIImageProcessorInput::roiTileCount is REQUIRED and should be abstract
 !incorrect-protocol-member! CIImageProcessorInput::roiTileIndex is REQUIRED and should be abstract
+# xcode 16
+!missing-selector! +CIFilter::areaAlphaWeightedHistogramFilter not bound
+!missing-selector! +CIFilter::areaBoundsRedFilter not bound
+!missing-selector! +CIFilter::maximumScaleTransformFilter not bound
+!missing-selector! +CIFilter::toneMapHeadroomFilter not bound
diff --git a/tests/xtro-sharpie/iOS-CoreImage.ignore b/tests/xtro-sharpie/iOS-CoreImage.ignore
@@ -1,3 +1,5 @@
 ## OSX-only API, rdar #22524785
 ## see https://trello.com/c/kpksFWto/6-22524785-coreimage-headers-discrepancies
 !missing-selector! CIKernel::setROISelector: not bound
+# removed in XAMCORE_5_0
+!unknown-type! CIFilterGenerator bound
diff --git a/tests/xtro-sharpie/iOS-CoreImage.todo b/tests/xtro-sharpie/iOS-CoreImage.todo
diff --git a/tests/xtro-sharpie/macOS-CoreImage.todo b/tests/xtro-sharpie/macOS-CoreImage.todo
diff --git a/tests/xtro-sharpie/tvOS-CoreImage.todo b/tests/xtro-sharpie/tvOS-CoreImage.todo