From 30c4d90ffabf989f0a01f481244854490f41b201 Mon Sep 17 00:00:00 2001 From: Sebastien Pouliot Date: Mon, 19 Oct 2020 07:56:29 -0400 Subject: [PATCH] [xcode12.2][coreimage] Update availability and new API from Xcode 12.1 GM (#9906) --- src/coreimage.cs | 27 ++++++++++++++++++++----- tests/xtro-sharpie/iOS-CoreImage.todo | 3 --- tests/xtro-sharpie/macOS-CoreImage.todo | 3 --- tests/xtro-sharpie/tvOS-CoreImage.todo | 3 --- 4 files changed, 22 insertions(+), 14 deletions(-) delete mode 100644 tests/xtro-sharpie/iOS-CoreImage.todo delete mode 100644 tests/xtro-sharpie/macOS-CoreImage.todo delete mode 100644 tests/xtro-sharpie/tvOS-CoreImage.todo diff --git a/src/coreimage.cs b/src/coreimage.cs index 6814355904..1eb6f7d309 100644 --- a/src/coreimage.cs +++ b/src/coreimage.cs @@ -506,6 +506,11 @@ namespace CoreImage { [Export ("depthBlurEffectFilterForImage:disparityImage:portraitEffectsMatte:hairSemanticSegmentation:orientation:options:")] [return: NullAllowed] CIFilter GetDepthBlurEffectFilter (CIImage image, CIImage disparityImage, [NullAllowed] CIImage portraitEffectsMatte, [NullAllowed] CIImage hairSemanticSegmentation, CGImagePropertyOrientation orientation, [NullAllowed] NSDictionary options); + + [iOS (14,1)][TV (14,2)][Mac (11,0)] + [Export ("depthBlurEffectFilterForImage:disparityImage:portraitEffectsMatte:hairSemanticSegmentation:glassesMatte:gainMap:orientation:options:")] + [return: NullAllowed] + CIFilter GetDepthBlurEffectFilter (CIImage image, CIImage disparityImage, [NullAllowed] CIImage portraitEffectsMatte, [NullAllowed] CIImage hairSemanticSegmentation, [NullAllowed] CIImage glassesMatte, [NullAllowed] CIImage gainMap, CGImagePropertyOrientation orientation, [NullAllowed] NSDictionary options); } [BaseType (typeof (NSObject))] @@ -1328,7 +1333,10 @@ namespace CoreImage { [iOS (13,0)][TV (13,0)][Mac (10,15)] bool AuxiliarySemanticSegmentationTeethMatte { get; set; } - [iOS (14,2)][TV (14,2)][Mac (11,0)] + [iOS (14,1)][TV (14,2)][Mac (11,0)] + bool AuxiliarySemanticSegmentationGlassesMatte { get; set; } + + [iOS (14,1)][TV (14,2)][Mac (11,0)] bool ToneMapHdrToSdr { get; set; } } @@ -1338,10 +1346,6 @@ namespace CoreImage { [Field ("kCIImageColorSpace")] NSString ColorSpaceKey { get; } - [iOS (14,2)][TV (14,2)][Mac (11,0)] - [Field ("kCIImageToneMapHDRtoSDR")] - NSString ToneMapHdrToSdrKey { get; } - [Field ("kCIImageProperties")] NSString PropertiesKey { get; } @@ -1376,6 +1380,15 @@ namespace CoreImage { [iOS (13,0)][TV (13,0)][Mac (10,15)] [Field ("kCIImageAuxiliarySemanticSegmentationTeethMatte")] NSString AuxiliarySemanticSegmentationTeethMatteKey { get; } + + [iOS (14,1)][TV (14,2)][Mac (11,0)] + [Field ("kCIImageAuxiliarySemanticSegmentationGlassesMatte")] + NSString AuxiliarySemanticSegmentationGlassesMatteKey { get; } + + [iOS (14,1)][TV (14,2)][Mac (11,0)] + [Field ("kCIImageToneMapHDRtoSDR")] + NSString ToneMapHdrToSdrKey { get; } + } [BaseType (typeof (NSObject))] @@ -5732,6 +5745,10 @@ namespace CoreImage { [iOS (13,0)][TV (13,0)][Mac (10,15)] [Field ("kCIImageRepresentationSemanticSegmentationTeethMatteImage")] NSString SemanticSegmentationTeethMatteImageKey { get; } + + [iOS (14,1)][TV (14,2)][Mac (11,0)] + [Field ("kCIImageRepresentationSemanticSegmentationGlassesMatteImage")] + NSString SemanticSegmentationGlassesMatteImage { get; } } [iOS (11,0)] diff --git a/tests/xtro-sharpie/iOS-CoreImage.todo b/tests/xtro-sharpie/iOS-CoreImage.todo deleted file mode 100644 index 9017ab8246..0000000000 --- a/tests/xtro-sharpie/iOS-CoreImage.todo +++ /dev/null @@ -1,3 +0,0 @@ -!missing-field! kCIImageAuxiliarySemanticSegmentationGlassesMatte not bound -!missing-field! kCIImageRepresentationSemanticSegmentationGlassesMatteImage not bound -!missing-selector! CIContext::depthBlurEffectFilterForImage:disparityImage:portraitEffectsMatte:hairSemanticSegmentation:glassesMatte:gainMap:orientation:options: not bound diff --git a/tests/xtro-sharpie/macOS-CoreImage.todo b/tests/xtro-sharpie/macOS-CoreImage.todo deleted file mode 100644 index 9017ab8246..0000000000 --- a/tests/xtro-sharpie/macOS-CoreImage.todo +++ /dev/null @@ -1,3 +0,0 @@ -!missing-field! kCIImageAuxiliarySemanticSegmentationGlassesMatte not bound -!missing-field! kCIImageRepresentationSemanticSegmentationGlassesMatteImage not bound -!missing-selector! CIContext::depthBlurEffectFilterForImage:disparityImage:portraitEffectsMatte:hairSemanticSegmentation:glassesMatte:gainMap:orientation:options: not bound diff --git a/tests/xtro-sharpie/tvOS-CoreImage.todo b/tests/xtro-sharpie/tvOS-CoreImage.todo deleted file mode 100644 index 9017ab8246..0000000000 --- a/tests/xtro-sharpie/tvOS-CoreImage.todo +++ /dev/null @@ -1,3 +0,0 @@ -!missing-field! kCIImageAuxiliarySemanticSegmentationGlassesMatte not bound -!missing-field! kCIImageRepresentationSemanticSegmentationGlassesMatteImage not bound -!missing-selector! CIContext::depthBlurEffectFilterForImage:disparityImage:portraitEffectsMatte:hairSemanticSegmentation:glassesMatte:gainMap:orientation:options: not bound