ImageIO watchOS xcode15.0 b1

#ImageIO.framework https://github.com/xamarin/xamarin-macios/pull/18976

diff -ruN /Applications/Xcode_14.3.1.app/Contents/Developer/Platforms/WatchOS.platform/Developer/SDKs/WatchOS.sdk/System/Library/Frameworks/ImageIO.framework/Headers/CGImageDestination.h /Applications/Xcode_15.0.0-beta.app/Contents/Developer/Platforms/WatchOS.platform/Developer/SDKs/WatchOS.sdk/System/Library/Frameworks/ImageIO.framework/Headers/CGImageDestination.h
--- /Applications/Xcode_14.3.1.app/Contents/Developer/Platforms/WatchOS.platform/Developer/SDKs/WatchOS.sdk/System/Library/Frameworks/ImageIO.framework/Headers/CGImageDestination.h	2023-03-09 19:13:55
+++ /Applications/Xcode_15.0.0-beta.app/Contents/Developer/Platforms/WatchOS.platform/Developer/SDKs/WatchOS.sdk/System/Library/Frameworks/ImageIO.framework/Headers/CGImageDestination.h	2023-05-31 08:40:35
@@ -58,9 +58,7 @@
  */
 IMAGEIO_EXTERN const CFStringRef kCGImageDestinationOptimizeColorForSharing  IMAGEIO_AVAILABLE_STARTING(10.12, 9.3);
 
-CF_ASSUME_NONNULL_END
 
-
 /* Return the CFTypeID for CGImageDestinations. */
 
 IMAGEIO_EXTERN CFTypeID CGImageDestinationGetTypeID(void)  IMAGEIO_AVAILABLE_STARTING(10.4, 4.0);
@@ -134,7 +132,6 @@
  * destination. */
 IMAGEIO_EXTERN void CGImageDestinationAddImageAndMetadata(CGImageDestinationRef _iio_Nonnull idst, CGImageRef _iio_Nonnull image, CGImageMetadataRef _iio_Nullable metadata, CFDictionaryRef _iio_Nullable options)  IMAGEIO_AVAILABLE_STARTING(10.8, 7.0);
 
-CF_ASSUME_NONNULL_BEGIN
 /* For CGImageDestinationAddImageFromSource: when set to kCFBooleanTrue, a HEIF-embedded GainMap will be preserved.
  * If the destination image is scaled (using kCGImageDestinationImageMaxPixelSize), the GainMap will be scaled accordingly.
  * The value should be kCFBooleanTrue or kCFBooleanFalse
@@ -192,7 +189,6 @@
  */
 IMAGEIO_EXTERN const CFStringRef kCGImageDestinationOrientation IMAGEIO_AVAILABLE_STARTING(10.8, 7.0);
 
-CF_ASSUME_NONNULL_END
 
 /* Losslessly copies the contents of the image source, 'isrc', to the 
  * destination, 'idst'. The image data will not be modified. The image's 
@@ -214,6 +210,8 @@
  * To add auxiliary data to an image, call CGImageDestinationAddAuxiliaryDataInfo() after adding the CGImage to the CGImageDestinationRef.
  */
 IMAGEIO_EXTERN void CGImageDestinationAddAuxiliaryDataInfo(CGImageDestinationRef _iio_Nonnull idst, CFStringRef _iio_Nonnull auxiliaryImageDataType, CFDictionaryRef _iio_Nonnull auxiliaryDataInfoDictionary ) IMAGEIO_AVAILABLE_STARTING(10.13, 11.0);
+
+CF_ASSUME_NONNULL_END
 
 CF_IMPLICIT_BRIDGING_DISABLED
 
diff -ruN /Applications/Xcode_14.3.1.app/Contents/Developer/Platforms/WatchOS.platform/Developer/SDKs/WatchOS.sdk/System/Library/Frameworks/ImageIO.framework/Headers/CGImageMetadata.h /Applications/Xcode_15.0.0-beta.app/Contents/Developer/Platforms/WatchOS.platform/Developer/SDKs/WatchOS.sdk/System/Library/Frameworks/ImageIO.framework/Headers/CGImageMetadata.h
--- /Applications/Xcode_14.3.1.app/Contents/Developer/Platforms/WatchOS.platform/Developer/SDKs/WatchOS.sdk/System/Library/Frameworks/ImageIO.framework/Headers/CGImageMetadata.h	2023-03-09 19:09:20
+++ /Applications/Xcode_15.0.0-beta.app/Contents/Developer/Platforms/WatchOS.platform/Developer/SDKs/WatchOS.sdk/System/Library/Frameworks/ImageIO.framework/Headers/CGImageMetadata.h	2023-05-31 03:58:49
@@ -11,6 +11,8 @@
 
 CF_IMPLICIT_BRIDGING_ENABLED
 
+CF_ASSUME_NONNULL_BEGIN
+
 /*!
  * @header CGImageMetadata.h
  * @abstract Implements access to image metadata
@@ -94,9 +96,7 @@
 // Constants for use in a CGImageMetadataTag
 // ****************************************************************************
 
-CF_ASSUME_NONNULL_BEGIN
-
-// All metadata tags must contain a namespace. Clients may use one of the 
+// All metadata tags must contain a namespace. Clients may use one of the
 // public namespaces defined below or create their own namespace. If a caller
 // defines their own namespace, it should comply with the guidelines set forth
 // by Adobe in their XMP specification at:
@@ -136,8 +136,6 @@
 IMAGEIO_EXTERN const CFStringRef  kCGImageMetadataPrefixXMPBasic IMAGEIO_AVAILABLE_STARTING(10.8, 7.0);
 IMAGEIO_EXTERN const CFStringRef  kCGImageMetadataPrefixXMPRights IMAGEIO_AVAILABLE_STARTING(10.8, 7.0);
 
-CF_ASSUME_NONNULL_END
-
 // Metadata value type constants.
 /*!
  * @typedef CGImageMetadataType
@@ -628,6 +626,8 @@
     kCGImageMetadataErrorConflictingArguments = 3,
     kCGImageMetadataErrorPrefixConflict = 4,
 };
+
+CF_ASSUME_NONNULL_END
 
 CF_IMPLICIT_BRIDGING_DISABLED
 
diff -ruN /Applications/Xcode_14.3.1.app/Contents/Developer/Platforms/WatchOS.platform/Developer/SDKs/WatchOS.sdk/System/Library/Frameworks/ImageIO.framework/Headers/CGImageProperties.h /Applications/Xcode_15.0.0-beta.app/Contents/Developer/Platforms/WatchOS.platform/Developer/SDKs/WatchOS.sdk/System/Library/Frameworks/ImageIO.framework/Headers/CGImageProperties.h
--- /Applications/Xcode_14.3.1.app/Contents/Developer/Platforms/WatchOS.platform/Developer/SDKs/WatchOS.sdk/System/Library/Frameworks/ImageIO.framework/Headers/CGImageProperties.h	2023-03-09 19:13:55
+++ /Applications/Xcode_15.0.0-beta.app/Contents/Developer/Platforms/WatchOS.platform/Developer/SDKs/WatchOS.sdk/System/Library/Frameworks/ImageIO.framework/Headers/CGImageProperties.h	2023-05-31 03:56:11
@@ -42,6 +42,7 @@
 IMAGEIO_EXTERN const CFStringRef kCGImagePropertyMakerAppleDictionary  IMAGEIO_AVAILABLE_STARTING(10.10, 7.0);
 IMAGEIO_EXTERN const CFStringRef kCGImagePropertyFileContentsDictionary IMAGEIO_AVAILABLE_STARTING(10.13, 11.0);
 IMAGEIO_EXTERN const CFStringRef kCGImagePropertyWebPDictionary  IMAGEIO_AVAILABLE_STARTING(11.0, 14.0);
+IMAGEIO_EXTERN const CFStringRef kCGImagePropertyAVISDictionary  IMAGEIO_AVAILABLE_STARTING(13.0, 16.0);
 IMAGEIO_EXTERN const CFStringRef kCGImagePropertyTGADictionary  IMAGEIO_AVAILABLE_STARTING(11.0, 14.0);
 
 
@@ -792,12 +793,6 @@
 #define IMAGEIO_PNG_FILTER_AVG     0x40
 #define IMAGEIO_PNG_FILTER_PAETH   0x80
 #define IMAGEIO_PNG_ALL_FILTERS (IMAGEIO_PNG_FILTER_NONE | IMAGEIO_PNG_FILTER_SUB | IMAGEIO_PNG_FILTER_UP | IMAGEIO_PNG_FILTER_AVG | IMAGEIO_PNG_FILTER_PAETH)
-
-/*  For EXR files:
- *  The value (CFNumberRef) specifies the EXR compression method. See AppleEXR.h for possible values.
- *  Default value if not specified is 'axr_compression_piz'
- */
-IMAGEIO_EXTERN const CFStringRef kCGImagePropertyOpenEXRCompression    IMAGEIO_AVAILABLE_STARTING(13.3, 16.3);
 
 /*
  * For PNG files:
diff -ruN /Applications/Xcode_14.3.1.app/Contents/Developer/Platforms/WatchOS.platform/Developer/SDKs/WatchOS.sdk/System/Library/Frameworks/ImageIO.framework/Headers/CGImageSource.h /Applications/Xcode_15.0.0-beta.app/Contents/Developer/Platforms/WatchOS.platform/Developer/SDKs/WatchOS.sdk/System/Library/Frameworks/ImageIO.framework/Headers/CGImageSource.h
--- /Applications/Xcode_14.3.1.app/Contents/Developer/Platforms/WatchOS.platform/Developer/SDKs/WatchOS.sdk/System/Library/Frameworks/ImageIO.framework/Headers/CGImageSource.h	2023-03-09 19:17:11
+++ /Applications/Xcode_15.0.0-beta.app/Contents/Developer/Platforms/WatchOS.platform/Developer/SDKs/WatchOS.sdk/System/Library/Frameworks/ImageIO.framework/Headers/CGImageSource.h	2023-05-31 03:56:11
@@ -16,6 +16,8 @@
 
 CF_IMPLICIT_BRIDGING_ENABLED
 
+CF_ASSUME_NONNULL_BEGIN
+
 typedef CF_ENUM(int32_t, CGImageSourceStatus) {
     kCGImageStatusUnexpectedEOF = -5,
     kCGImageStatusInvalidData = -4,
@@ -25,8 +27,6 @@
     kCGImageStatusComplete = 0
 };
 
-CF_ASSUME_NONNULL_BEGIN
-
 /** Keys for the options dictionary when creating a CGImageSourceRef. **/
 
 /* Specifies the "best guess" of the type identifier for the format of the
@@ -109,9 +109,7 @@
 
 IMAGEIO_EXTERN const CFStringRef kCGImageSourceSubsampleFactor  IMAGEIO_AVAILABLE_STARTING(10.11, 9.0);
 
-CF_ASSUME_NONNULL_END
 
-
 /* Return the CFTypeID for CGImageSources. */
 
 IMAGEIO_EXTERN CFTypeID CGImageSourceGetTypeID (void)  IMAGEIO_AVAILABLE_STARTING(10.4, 4.0);
@@ -235,6 +233,23 @@
  * CGImageSourceCopyAuxiliaryDataInfoAtIndex returns nil if the image did not contain ‘auxiliaryImageDataType’ data.
  */
 IMAGEIO_EXTERN CFDictionaryRef _iio_Nullable CGImageSourceCopyAuxiliaryDataInfoAtIndex(CGImageSourceRef _iio_Nonnull isrc, size_t index, CFStringRef _iio_Nonnull auxiliaryImageDataType ) IMAGEIO_AVAILABLE_STARTING(10.13, 11.0);
+
+
+/* HDR-related */
+
+/* kCGImageSourceDecodeRequest - value is one of the predefined keys (kCGImageSourceDecodeToHDR, kCGImageSourceDecodeToSDR, ...)
+ */
+IMAGEIO_EXTERN const CFStringRef kCGImageSourceDecodeRequest    IMAGEIO_AVAILABLE_STARTING(14.0, 17.0, 17.0, 10.0);
+
+IMAGEIO_EXTERN const CFStringRef kCGImageSourceDecodeToHDR      IMAGEIO_AVAILABLE_STARTING(14.0, 17.0, 17.0, 10.0);
+IMAGEIO_EXTERN const CFStringRef kCGImageSourceDecodeToSDR      IMAGEIO_AVAILABLE_STARTING(14.0, 17.0, 17.0, 10.0);
+
+/* kCGImageSourceDecodeRequestOptions - CFDictionaryRef to specify additional options
+ */
+IMAGEIO_EXTERN const CFStringRef kCGImageSourceDecodeRequestOptions     IMAGEIO_AVAILABLE_STARTING(14.0, 17.0, 17.0, 10.0);
+
+
+CF_ASSUME_NONNULL_END
 
 CF_IMPLICIT_BRIDGING_DISABLED
 
diff -ruN /Applications/Xcode_14.3.1.app/Contents/Developer/Platforms/WatchOS.platform/Developer/SDKs/WatchOS.sdk/System/Library/Frameworks/ImageIO.framework/Headers/ImageIOBase.h /Applications/Xcode_15.0.0-beta.app/Contents/Developer/Platforms/WatchOS.platform/Developer/SDKs/WatchOS.sdk/System/Library/Frameworks/ImageIO.framework/Headers/ImageIOBase.h
--- /Applications/Xcode_14.3.1.app/Contents/Developer/Platforms/WatchOS.platform/Developer/SDKs/WatchOS.sdk/System/Library/Frameworks/ImageIO.framework/Headers/ImageIOBase.h	2023-03-09 19:13:55
+++ /Applications/Xcode_15.0.0-beta.app/Contents/Developer/Platforms/WatchOS.platform/Developer/SDKs/WatchOS.sdk/System/Library/Frameworks/ImageIO.framework/Headers/ImageIOBase.h	2023-05-31 03:56:11
@@ -93,11 +93,7 @@
 #endif
 
 #if !defined(IIO_HAS_IOSURFACE)
-#   if (!IMAGEIO_bridgeOS) 
-#       define IIO_HAS_IOSURFACE 1
-#   else
-#       define IIO_HAS_IOSURFACE 0
-#   endif
+#   define IIO_HAS_IOSURFACE 1
 #endif
 
 #if defined(__has_feature) && __has_feature(objc_bridge_id)