diff --git a/src/coreimage.cs b/src/coreimage.cs index 04f9618149..070ffb068b 100644 --- a/src/coreimage.cs +++ b/src/coreimage.cs @@ -419,7 +419,7 @@ namespace XamCore.CoreImage { NSData GetJpegRepresentation (CIImage image, CGColorSpace colorSpace, CIImageRepresentationOptions options); #endif - [iOS (11,0)][TV (11,0)][Mac (10,13)] + [iOS (11,0)][TV (11,0)][Mac (10,13,4)] [Export ("HEIFRepresentationOfImage:format:colorSpace:options:")] [return: NullAllowed] NSData GetHeifRepresentation (CIImage image, CIFormat format, CGColorSpace colorSpace, NSDictionary options); @@ -463,7 +463,7 @@ namespace XamCore.CoreImage { bool WriteJpegRepresentation (CIImage image, NSUrl url, CGColorSpace colorSpace, CIImageRepresentationOptions options, [NullAllowed] out NSError error); #endif - [iOS (11,0)][TV (11,0)][Mac (10,13)] + [iOS (11,0)][TV (11,0)][Mac (10,13,4)] [Export ("writeHEIFRepresentationOfImage:toURL:format:colorSpace:options:error:")] bool WriteHeifRepresentation (CIImage image, NSUrl url, CIFormat format, CGColorSpace colorSpace, NSDictionary options, [NullAllowed] out NSError error); diff --git a/src/foundation.cs b/src/foundation.cs index 0503a1afcb..fad284d2fd 100644 --- a/src/foundation.cs +++ b/src/foundation.cs @@ -68,6 +68,12 @@ using OSType = System.UInt32; using NSTimeInterval = System.Double; #endif +#if WATCH +using CIBarcodeDescriptor = XamCore.Foundation.NSObject; +#else +using XamCore.CoreImage; +#endif + // This little gem comes from a btouch bug that wrote the NSFilePresenterReacquirer delegate to the wrong // namespace for a while (it should go into Foundation, but due to the bug it went into UIKit). In order // to not break backwards compatibility (once the btouch bug was fixed), we need to make sure the delegate @@ -5086,6 +5092,12 @@ namespace XamCore.Foundation [Watch (4, 0), TV (11, 0), Mac (10, 13), iOS (11, 0)] [NullAllowed, Export ("referrerURL", ArgumentSemantic.Copy)] NSUrl ReferrerUrl { get; set; } + + // From NSUserActivity (CIBarcodeDescriptor) + + [TV (11,3), Mac (10,13,4, onlyOn64: true), iOS (11,3), NoWatch] + [NullAllowed, Export ("detectedBarcodeDescriptor", ArgumentSemantic.Copy)] + CIBarcodeDescriptor DetectedBarcodeDescriptor { get; } } [iOS (8,0)][Mac (10,10, onlyOn64 : true)] // same as NSUserActivity diff --git a/tests/xtro-sharpie/iOS-CoreImage.todo b/tests/xtro-sharpie/iOS-CoreImage.todo index e6825f5ba6..e69de29bb2 100644 --- a/tests/xtro-sharpie/iOS-CoreImage.todo +++ b/tests/xtro-sharpie/iOS-CoreImage.todo @@ -1 +0,0 @@ -!missing-selector! NSUserActivity::detectedBarcodeDescriptor not bound diff --git a/tests/xtro-sharpie/macOS-CoreImage.todo b/tests/xtro-sharpie/macOS-CoreImage.todo index e6825f5ba6..e69de29bb2 100644 --- a/tests/xtro-sharpie/macOS-CoreImage.todo +++ b/tests/xtro-sharpie/macOS-CoreImage.todo @@ -1 +0,0 @@ -!missing-selector! NSUserActivity::detectedBarcodeDescriptor not bound diff --git a/tests/xtro-sharpie/tvOS-CoreImage.todo b/tests/xtro-sharpie/tvOS-CoreImage.todo index e6825f5ba6..e69de29bb2 100644 --- a/tests/xtro-sharpie/tvOS-CoreImage.todo +++ b/tests/xtro-sharpie/tvOS-CoreImage.todo @@ -1 +0,0 @@ -!missing-selector! NSUserActivity::detectedBarcodeDescriptor not bound