Skip to content

CoreGraphics macOS xcode14.0 rc

Israel Soto edited this page Sep 7, 2022 · 1 revision

#CoreGraphics.framework

diff -ruN /Applications/Xcode_14.0.0-beta6.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/System/Library/Frameworks/CoreGraphics.framework/Headers/CGAffineTransform.h /Applications/Xcode_14.0.0-rc.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/System/Library/Frameworks/CoreGraphics.framework/Headers/CGAffineTransform.h
--- /Applications/Xcode_14.0.0-beta6.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/System/Library/Frameworks/CoreGraphics.framework/Headers/CGAffineTransform.h	2022-08-05 12:40:15.000000000 -0500
+++ /Applications/Xcode_14.0.0-rc.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/System/Library/Frameworks/CoreGraphics.framework/Headers/CGAffineTransform.h	2022-08-03 21:05:32.000000000 -0500
@@ -5,51 +5,18 @@
 #ifndef CGAFFINETRANSFORM_H_
 #define CGAFFINETRANSFORM_H_
 
+typedef struct CGAffineTransform CGAffineTransform;
+
 #include <CoreGraphics/CGBase.h>
 #include <CoreGraphics/CGGeometry.h>
-#include <CoreFoundation/CFBase.h>
 
 CF_IMPLICIT_BRIDGING_ENABLED
 
-#ifndef CF_DEFINES_CG_TYPES
-typedef struct CGAffineTransform CGAffineTransform;
-
 struct CGAffineTransform {
   CGFloat a, b, c, d;
   CGFloat tx, ty;
 };
 
-#endif /* CF_DEFINES_CG_TYPES */
-
-#ifndef CF_DEFINES_CGAFFINETRANSFORMCOMPONENTS
-/*                      |------------------ CGAffineTransformComponents ----------------|
- *
- *      | a  b  0 |     | sx  0  0 |   |  1  0  0 |   | cos(t)  sin(t)  0 |   | 1  0  0 |
- *      | c  d  0 |  =  |  0 sy  0 | * | sh  1  0 | * |-sin(t)  cos(t)  0 | * | 0  1  0 |
- *      | tx ty 1 |     |  0  0  1 |   |  0  0  1 |   |   0       0     1 |   | tx ty 1 |
- *  CGAffineTransform      scale           shear            rotation          translation
- */
-
-typedef struct CGAffineTransformComponents
-{
-    /* initial scaling in X and Y dimensions. {sx,sy} */
-    /* Negative values indicate the image has been flipped in this dimension. */
-    CGSize      scale;
-    
-    /* shear distortion (sh). Turns rectangles to parallelograms. 0 for no shear. Typically 0. */
-    CGFloat     horizontalShear;
-    
-    /* Rotation angle in radians about the origin. (t) Sign convention for clockwise rotation */
-    /* may differ between various Apple frameworks based on origin placement. Please see discussion. */
-    CGFloat     rotation;
-
-    /* Displacement from the origin (ty, ty) */
-    CGVector    translation;
-} CGAffineTransformComponents;
-
-#endif /* CF_DEFINES_CGAFFINETRANSFORMCOMPONENTS */
-
-
 /* The identity transform: [ 1 0 0 1 0 0 ]. */
 
 CG_EXTERN const CGAffineTransform CGAffineTransformIdentity
@@ -57,80 +24,80 @@
 
 /* Return the transform [ a b c d tx ty ]. */
 
-CG_EXTERN CGAffineTransform CG_PURE CGAffineTransformMake(CGFloat a, CGFloat b,
+CG_EXTERN CGAffineTransform CGAffineTransformMake(CGFloat a, CGFloat b,
   CGFloat c, CGFloat d, CGFloat tx, CGFloat ty)
   CG_AVAILABLE_STARTING(10.0, 2.0);
 
 /* Return a transform which translates by `(tx, ty)':
      t' = [ 1 0 0 1 tx ty ] */
 
-CG_EXTERN CGAffineTransform CG_PURE CGAffineTransformMakeTranslation(CGFloat tx,
+CG_EXTERN CGAffineTransform CGAffineTransformMakeTranslation(CGFloat tx,
   CGFloat ty) CG_AVAILABLE_STARTING(10.0, 2.0);
 
 /* Return a transform which scales by `(sx, sy)':
      t' = [ sx 0 0 sy 0 0 ] */
 
-CG_EXTERN CGAffineTransform CG_PURE CGAffineTransformMakeScale(CGFloat sx, CGFloat sy)
+CG_EXTERN CGAffineTransform CGAffineTransformMakeScale(CGFloat sx, CGFloat sy)
   CG_AVAILABLE_STARTING(10.0, 2.0);
 
 /* Return a transform which rotates by `angle' radians:
      t' = [ cos(angle) sin(angle) -sin(angle) cos(angle) 0 0 ] */
 
-CG_EXTERN CGAffineTransform CG_PURE CGAffineTransformMakeRotation(CGFloat angle)
+CG_EXTERN CGAffineTransform CGAffineTransformMakeRotation(CGFloat angle)
   CG_AVAILABLE_STARTING(10.0, 2.0);
 
 /* Return true if `t' is the identity transform, false otherwise. */
 
-CG_EXTERN bool CG_PURE CGAffineTransformIsIdentity(CGAffineTransform t)
+CG_EXTERN bool CGAffineTransformIsIdentity(CGAffineTransform t)
   CG_AVAILABLE_STARTING(10.4, 2.0);
 
 /* Translate `t' by `(tx, ty)' and return the result:
      t' = [ 1 0 0 1 tx ty ] * t */
 
-CG_EXTERN CGAffineTransform CG_PURE CGAffineTransformTranslate(CGAffineTransform t,
+CG_EXTERN CGAffineTransform CGAffineTransformTranslate(CGAffineTransform t,
   CGFloat tx, CGFloat ty) CG_AVAILABLE_STARTING(10.0, 2.0);
 
 /* Scale `t' by `(sx, sy)' and return the result:
      t' = [ sx 0 0 sy 0 0 ] * t */
 
-CG_EXTERN CGAffineTransform CG_PURE CGAffineTransformScale(CGAffineTransform t,
+CG_EXTERN CGAffineTransform CGAffineTransformScale(CGAffineTransform t,
   CGFloat sx, CGFloat sy) CG_AVAILABLE_STARTING(10.0, 2.0);
 
 /* Rotate `t' by `angle' radians and return the result:
      t' =  [ cos(angle) sin(angle) -sin(angle) cos(angle) 0 0 ] * t */
 
-CG_EXTERN CGAffineTransform CG_PURE CGAffineTransformRotate(CGAffineTransform t,
+CG_EXTERN CGAffineTransform CGAffineTransformRotate(CGAffineTransform t,
   CGFloat angle) CG_AVAILABLE_STARTING(10.0, 2.0);
 
 /* Invert `t' and return the result. If `t' has zero determinant, then `t'
    is returned unchanged. */
 
-CG_EXTERN CGAffineTransform CG_PURE CGAffineTransformInvert(CGAffineTransform t)
+CG_EXTERN CGAffineTransform CGAffineTransformInvert(CGAffineTransform t)
   CG_AVAILABLE_STARTING(10.0, 2.0);
 
 /* Concatenate `t2' to `t1' and return the result:
      t' = t1 * t2 */
 
-CG_EXTERN CGAffineTransform CG_PURE CGAffineTransformConcat(CGAffineTransform t1,
+CG_EXTERN CGAffineTransform CGAffineTransformConcat(CGAffineTransform t1,
   CGAffineTransform t2) CG_AVAILABLE_STARTING(10.0, 2.0);
 
 /* Return true if `t1' and `t2' are equal, false otherwise. */
 
-CG_EXTERN bool CG_PURE CGAffineTransformEqualToTransform(CGAffineTransform t1,
+CG_EXTERN bool CGAffineTransformEqualToTransform(CGAffineTransform t1,
   CGAffineTransform t2) CG_AVAILABLE_STARTING(10.4, 2.0);
 
 /* Transform `point' by `t' and return the result:
      p' = p * t
    where p = [ x y 1 ]. */
 
-CG_EXTERN CGPoint CG_PURE CGPointApplyAffineTransform(CGPoint point,
+CG_EXTERN CGPoint CGPointApplyAffineTransform(CGPoint point,
   CGAffineTransform t) CG_AVAILABLE_STARTING(10.0, 2.0);
 
 /* Transform `size' by `t' and return the result:
      s' = s * t
    where s = [ width height 0 ]. */
 
-CG_EXTERN CGSize CG_PURE CGSizeApplyAffineTransform(CGSize size, CGAffineTransform t)
+CG_EXTERN CGSize CGSizeApplyAffineTransform(CGSize size, CGAffineTransform t)
   CG_AVAILABLE_STARTING(10.0, 2.0);
 
 /* Transform `rect' by `t' and return the result. Since affine transforms do
@@ -140,33 +107,9 @@
    rectangle coincides with the rectangle constructed from the four
    transformed corners. */
 
-CG_EXTERN CGRect CG_PURE CGRectApplyAffineTransform(CGRect rect, CGAffineTransform t)
+CG_EXTERN CGRect CGRectApplyAffineTransform(CGRect rect, CGAffineTransform t)
   CG_AVAILABLE_STARTING(10.4, 2.0);
 
-/*! @abstract Decompose a CGAffineTransform into a scale * shear * rotation * translation
- *  @discussion This decomposition method may be used to provide insight into what a
- *              arbitrary CGAffineTransform does. This may be necessary, for example, because
- *              an algorithm would like to know what the scaling portion of a transform is before rotation,
- *              or perhaps because some part of a transform is undesired and your application would like
- *              to replace a portion of it with a different transformation.
- *
- *              Since there are many ways to make a affine transform out of other affine transforms
- *              this method can not tell us the ordering of geometric steps used to create the original
- *              CGAffineTransform. It tells us what the transform does, not how it was made.
- *
- *  @param transform        The CGAffineTransform to decompose
- *  @return A decomposed set of geometric operations, the product of which is the CGAffineTransform.  */
-CG_EXTERN
- CGAffineTransformComponents CG_PURE CGAffineTransformDecompose( CGAffineTransform transform )
-CF_REFINED_FOR_SWIFT CG_AVAILABLE_STARTING( 13.0, 16.0 );
-
-/*! @abstract Create CGAffineTransform from scale * shear * rotation * translation CGAffineTransformComponents
- *  @param components        The set of CGAffineTransformComponents to use to create a new CGAffineTransform
- *  @return A new CGAffineTransform built from the provided components  */
-CG_EXTERN
- CGAffineTransform CG_PURE CGAffineTransformMakeWithComponents( CGAffineTransformComponents components )
-CF_REFINED_FOR_SWIFT CG_AVAILABLE_STARTING( 13.0, 16.0 );
-
 /*** Definitions of inline functions. ***/
 
 CG_INLINE CGAffineTransform
diff -ruN /Applications/Xcode_14.0.0-beta6.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/System/Library/Frameworks/CoreGraphics.framework/Headers/CGBase.h /Applications/Xcode_14.0.0-rc.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/System/Library/Frameworks/CoreGraphics.framework/Headers/CGBase.h
--- /Applications/Xcode_14.0.0-beta6.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/System/Library/Frameworks/CoreGraphics.framework/Headers/CGBase.h	2022-08-05 12:40:15.000000000 -0500
+++ /Applications/Xcode_14.0.0-rc.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/System/Library/Frameworks/CoreGraphics.framework/Headers/CGBase.h	2022-08-03 21:05:32.000000000 -0500
@@ -10,7 +10,6 @@
 #include <float.h>
 #include <TargetConditionals.h>
 #include <CoreFoundation/CFBase.h>
-#include <CoreFoundation/CFCGTypes.h>
 #include <os/availability.h>
 
 /* Definition of `__CG_HAS_COMPILER_ATTRIBUTE'. */
@@ -306,15 +305,6 @@
 # endif
 #endif
 
-/* Definition of CG_PURE. */
-#if !defined(CG_PURE)
-# if __CG_HAS_COMPILER_ATTRIBUTE(pure)
-#  define CG_PURE  __attribute__((pure))
-# else
-#  define CG_PURE 
-# endif
-#endif
-
 /* Definition of `__CG_FORMAT_PRINTF'. */
 
 #if !defined(__CG_FORMAT_PRINTF)
@@ -338,7 +328,6 @@
 # endif
 #endif
 
-#ifndef CF_DEFINES_CG_TYPES
 /* Definition of `CGFLOAT_TYPE', `CGFLOAT_IS_DOUBLE', `CGFLOAT_MIN', and
    `CGFLOAT_MAX'. */
 
@@ -361,8 +350,6 @@
 typedef CGFLOAT_TYPE CGFloat;
 #define CGFLOAT_DEFINED 1
 
-#endif /* CF_DEFINES_CG_TYPES */
-
 /* Definition of `CG_OBSOLETE'. Deprecated; to be removed. */
 
 #if !defined(CG_OBSOLETE)
diff -ruN /Applications/Xcode_14.0.0-beta6.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/System/Library/Frameworks/CoreGraphics.framework/Headers/CGColor.h /Applications/Xcode_14.0.0-rc.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/System/Library/Frameworks/CoreGraphics.framework/Headers/CGColor.h
--- /Applications/Xcode_14.0.0-beta6.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/System/Library/Frameworks/CoreGraphics.framework/Headers/CGColor.h	2022-08-05 12:45:51.000000000 -0500
+++ /Applications/Xcode_14.0.0-rc.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/System/Library/Frameworks/CoreGraphics.framework/Headers/CGColor.h	2022-08-03 21:05:34.000000000 -0500
@@ -9,7 +9,7 @@
 #include <CoreFoundation/CFAvailability.h>
 #include <stdint.h>
 
-typedef struct CF_BRIDGED_TYPE(id) CGColor *CGColorRef; /* Swift Sendable */
+typedef struct CF_BRIDGED_TYPE(id) CGColor *CGColorRef;
 
 #include <CoreGraphics/CGBase.h>
 #include <CoreGraphics/CGColorSpace.h>
diff -ruN /Applications/Xcode_14.0.0-beta6.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/System/Library/Frameworks/CoreGraphics.framework/Headers/CGColorSpace.h /Applications/Xcode_14.0.0-rc.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/System/Library/Frameworks/CoreGraphics.framework/Headers/CGColorSpace.h
--- /Applications/Xcode_14.0.0-beta6.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/System/Library/Frameworks/CoreGraphics.framework/Headers/CGColorSpace.h	2022-08-05 15:53:12.000000000 -0500
+++ /Applications/Xcode_14.0.0-rc.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/System/Library/Frameworks/CoreGraphics.framework/Headers/CGColorSpace.h	2022-08-03 21:05:34.000000000 -0500
@@ -9,7 +9,7 @@
 #include <CoreFoundation/CFAvailability.h>
 #include <stdint.h>
 
-typedef struct CF_BRIDGED_TYPE(id) CGColorSpace *CGColorSpaceRef; /* Swift Sendable */
+typedef struct CF_BRIDGED_TYPE(id) CGColorSpace *CGColorSpaceRef;
 
 #include <CoreGraphics/CGBase.h>
 #include <CoreGraphics/CGDataProvider.h>
@@ -118,9 +118,6 @@
 CG_EXTERN const CFStringRef kCGColorSpaceITUR_709_PQ
 CG_AVAILABLE_STARTING(12.0, 15.1);
 
-CG_EXTERN const CFStringRef kCGColorSpaceITUR_709_HLG
-CG_AVAILABLE_STARTING(12.0, 15.1);
-
 CG_EXTERN const CFStringRef kCGColorSpaceITUR_2020
 CG_AVAILABLE_STARTING(10.11, 9.0);
 
@@ -468,9 +465,6 @@
 CG_EXTERN CGColorSpaceRef  __nullable CGColorSpaceCreateExtendedLinearized(CGColorSpaceRef space)
 CG_AVAILABLE_STARTING(11.0, 14.0);
 
-/* Create a copy of the color space which uses standard range [0.0, 1.0]. */
-CG_EXTERN CGColorSpaceRef CGColorSpaceCreateCopyWithStandardRange(CGColorSpaceRef s)
-CG_AVAILABLE_STARTING(13.0, 16.0);
 
 /* Deprecated functions */
 
diff -ruN /Applications/Xcode_14.0.0-beta6.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/System/Library/Frameworks/CoreGraphics.framework/Headers/CGGeometry.h /Applications/Xcode_14.0.0-rc.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/System/Library/Frameworks/CoreGraphics.framework/Headers/CGGeometry.h
--- /Applications/Xcode_14.0.0-beta6.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/System/Library/Frameworks/CoreGraphics.framework/Headers/CGGeometry.h	2022-08-05 12:47:12.000000000 -0500
+++ /Applications/Xcode_14.0.0-rc.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/System/Library/Frameworks/CoreGraphics.framework/Headers/CGGeometry.h	2022-08-03 21:05:34.000000000 -0500
@@ -15,7 +15,6 @@
 
 CF_ASSUME_NONNULL_BEGIN
 
-#ifndef CF_DEFINES_CG_TYPES
 /* Points. */
 struct
 CGPoint {
@@ -56,8 +55,6 @@
     CGRectMinXEdge, CGRectMinYEdge, CGRectMaxXEdge, CGRectMaxYEdge
 };
 
-#endif /* CF_DEFINES_CG_TYPES */
-
 /* The "zero" point -- equivalent to CGPointMake(0, 0). */ 
 
 CG_EXTERN const CGPoint CGPointZero
diff -ruN /Applications/Xcode_14.0.0-beta6.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/System/Library/Frameworks/CoreGraphics.framework/Headers/CGImage.h /Applications/Xcode_14.0.0-rc.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/System/Library/Frameworks/CoreGraphics.framework/Headers/CGImage.h
--- /Applications/Xcode_14.0.0-beta6.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/System/Library/Frameworks/CoreGraphics.framework/Headers/CGImage.h	2022-08-05 12:45:50.000000000 -0500
+++ /Applications/Xcode_14.0.0-rc.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/System/Library/Frameworks/CoreGraphics.framework/Headers/CGImage.h	2022-08-03 21:05:32.000000000 -0500
@@ -9,7 +9,7 @@
 #include <CoreFoundation/CFAvailability.h>
 #include <stdint.h>
 
-typedef struct CF_BRIDGED_TYPE(id) CGImage *CGImageRef;  /* Swift Sendable */
+typedef struct CF_BRIDGED_TYPE(id) CGImage *CGImageRef;
 
 #include <CoreGraphics/CGColorSpace.h>
 #include <CoreGraphics/CGDataProvider.h>
@@ -42,12 +42,10 @@
 typedef CF_ENUM(uint32_t, CGImagePixelFormatInfo) {
     kCGImagePixelFormatMask      = 0xF0000,
     kCGImagePixelFormatPacked    = (0 << 16),
-    kCGImagePixelFormatRGB555    = (1 << 16), /* Only for RGB 16 bits per pixel, alpha != alpha none */
-    kCGImagePixelFormatRGB565    = (2 << 16), /* Only for RGB 16 bits per pixel, alpha none */
-    kCGImagePixelFormatRGB101010 = (3 << 16), /* Only for RGB 32 bits per pixel, alpha != none */
-    kCGImagePixelFormatRGBCIF10  = (4 << 16)  /* Only for RGB 32 bits per pixel,
-                                               * 10 bits per component, kCGImageByteOrder32Little
-                                               * The 2 MSB of the pixel need to be set to 1 */
+    kCGImagePixelFormatRGB555    = (1 << 16), /* Only for RGB 16 bits per pixel */
+    kCGImagePixelFormatRGB565    = (2 << 16), /* Only for RGB 16 bits per pixel */
+    kCGImagePixelFormatRGB101010 = (3 << 16), /* Only for RGB 32 bits per pixel */
+    kCGImagePixelFormatRGBCIF10  = (4 << 16), /* Only for RGB 32 bits per pixel */
 } CG_AVAILABLE_STARTING(10.14, 12.0);
 
 typedef CF_OPTIONS(uint32_t, CGBitmapInfo) {
@@ -65,11 +63,11 @@
 } CG_AVAILABLE_STARTING(10.0, 2.0);
 
 #ifdef __BIG_ENDIAN__
-static const CGBitmapInfo kCGBitmapByteOrder16Host = kCGBitmapByteOrder16Big;
-static const CGBitmapInfo kCGBitmapByteOrder32Host = kCGBitmapByteOrder32Big;
+# define kCGBitmapByteOrder16Host kCGBitmapByteOrder16Big
+# define kCGBitmapByteOrder32Host kCGBitmapByteOrder32Big
 #else    /* Little endian. */
-static const CGBitmapInfo kCGBitmapByteOrder16Host = kCGBitmapByteOrder16Little;
-static const CGBitmapInfo kCGBitmapByteOrder32Host = kCGBitmapByteOrder32Little;
+# define kCGBitmapByteOrder16Host kCGBitmapByteOrder16Little
+# define kCGBitmapByteOrder32Host kCGBitmapByteOrder32Little
 #endif
 
 /* Return the CFTypeID for CGImageRefs. */
diff -ruN /Applications/Xcode_14.0.0-beta6.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/System/Library/Frameworks/CoreGraphics.framework/Headers/CGPDFScanner.h /Applications/Xcode_14.0.0-rc.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/System/Library/Frameworks/CoreGraphics.framework/Headers/CGPDFScanner.h
--- /Applications/Xcode_14.0.0-beta6.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/System/Library/Frameworks/CoreGraphics.framework/Headers/CGPDFScanner.h	2022-08-06 02:26:41.000000000 -0500
+++ /Applications/Xcode_14.0.0-rc.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/System/Library/Frameworks/CoreGraphics.framework/Headers/CGPDFScanner.h	2022-08-03 21:05:33.000000000 -0500
@@ -112,10 +112,6 @@
     CGPDFStreamRef __nullable * __nullable value)
     CG_AVAILABLE_STARTING(10.4, 2.0);
 
-/* Cleanly stop the scanner on the current operator, releasing any
-   temporary resources. */
-CG_EXTERN void CGPDFScannerStop(CGPDFScannerRef s);
-
 CF_ASSUME_NONNULL_END
 
 CF_IMPLICIT_BRIDGING_DISABLED
diff -ruN /Applications/Xcode_14.0.0-beta6.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/System/Library/Frameworks/CoreGraphics.framework/Headers/CGPath.h /Applications/Xcode_14.0.0-rc.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/System/Library/Frameworks/CoreGraphics.framework/Headers/CGPath.h
--- /Applications/Xcode_14.0.0-beta6.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/System/Library/Frameworks/CoreGraphics.framework/Headers/CGPath.h	2022-08-05 12:47:12.000000000 -0500
+++ /Applications/Xcode_14.0.0-rc.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/System/Library/Frameworks/CoreGraphics.framework/Headers/CGPath.h	2022-08-03 21:05:34.000000000 -0500
@@ -15,7 +15,6 @@
 #include <CoreGraphics/CGBase.h>
 #include <CoreGraphics/CGAffineTransform.h>
 #include <CoreFoundation/CFBase.h>
-#include <CoreFoundation/CFArray.h>
 
 CF_IMPLICIT_BRIDGING_ENABLED
 
@@ -394,46 +393,6 @@
 CG_EXTERN void CGPathApplyWithBlock(CGPathRef path, CGPathApplyBlock CF_NOESCAPE block)
     CG_AVAILABLE_STARTING(10.13, 11.0);
 
-
-/* Returns a new weakly-simple path without self-intersections and with a normalized orientation. Filling the resulting path using even-odd or non-zero filling is identical. */
-
-CG_EXTERN CGPathRef __nullable CGPathCreateCopyByNormalizing(CGPathRef cg_nullable path, bool evenOddFillRule) CG_AVAILABLE_STARTING(13.0, 16.0);
-
-/* Returns a new path created by unioning `path` and `maskPath`. Any unclosed subpaths in either path are assumed to be closed. The resulting path is suitable for either even-odd or non-zero filling. */
-
-CG_EXTERN CGPathRef __nullable CGPathCreateCopyByUnioningPath(CGPathRef cg_nullable path, CGPathRef cg_nullable maskPath, bool evenOddFillRule) CG_AVAILABLE_STARTING(13.0, 16.0);
-
-/* Returns a new path created by intersecting `path` and `maskPath`. Any unclosed subpaths in either path are assumed to be closed. The resulting path is suitable for either even-odd or non-zero filling. */
-
-CG_EXTERN CGPathRef __nullable CGPathCreateCopyByIntersectingPath(CGPathRef cg_nullable path, CGPathRef cg_nullable maskPath, bool evenOddFillRule) CG_AVAILABLE_STARTING(13.0, 16.0);
-
-/* Returns a new path created by subtracting `maskPath` from `path`. Any unclosed subpaths in either path are assumed to be closed. The resulting path is suitable for either even-odd or non-zero filling. */
-
-CG_EXTERN CGPathRef __nullable CGPathCreateCopyBySubtractingPath(CGPathRef cg_nullable path, CGPathRef cg_nullable maskPath, bool evenOddFillRule) CG_AVAILABLE_STARTING(13.0, 16.0);
-
-/* Returns a new path created by exclusive or-ing `path` and `maskPath`. Any unclosed subpaths in either path are assumed to be closed. The resulting path is suitable for either even-odd or non-zero filling. */
-
-CG_EXTERN CGPathRef __nullable CGPathCreateCopyBySymmetricDifferenceOfPath(CGPathRef cg_nullable path, CGPathRef cg_nullable maskPath, bool evenOddFillRule) CG_AVAILABLE_STARTING(13.0, 16.0);
-
-/* Returns a new path created by subtracting the `maskPath` from the line of `path` with the fill of `maskPath`. This returns a potentially open path. */
-
-CG_EXTERN CGPathRef __nullable CGPathCreateCopyOfLineBySubtractingPath(CGPathRef cg_nullable path, CGPathRef cg_nullable maskPath, bool evenOddFillRule) CG_AVAILABLE_STARTING(13.0, 16.0);
-
-/* Returns a new path created by intersecting the line of `path` and the fill of `maskPath`. This returns a potentially open path. */
-
-CG_EXTERN CGPathRef __nullable CGPathCreateCopyOfLineByIntersectingPath(CGPathRef cg_nullable path, CGPathRef cg_nullable maskPath, bool evenOddFillRule) CG_AVAILABLE_STARTING(13.0, 16.0);
-
-/* Return an array of the visually separated components of a path. */
-
-CG_EXTERN CFArrayRef __nullable CGPathCreateSeparateComponents(CGPathRef cg_nullable path, bool evenOddFillRule) CG_AVAILABLE_STARTING(13.0, 16.0);
-
-/* Returns a new path that is flattened, converting all curved line segments into straight line approximations. The granularity of the approximations is controlled by `flatteningThreshold`  the maximum error tolerance (measured in points) for curves. */
-
-CG_EXTERN CGPathRef __nullable CGPathCreateCopyByFlattening(CGPathRef cg_nullable path, CGFloat flatteningThreshold) CG_AVAILABLE_STARTING(13.0, 16.0);
-
-/* Returns true if path1 and path2 overlap. */
-CG_EXTERN bool CGPathIntersectsPath(CGPathRef cg_nullable path1, CGPathRef cg_nullable path2, bool evenOddFillRule) CG_AVAILABLE_STARTING(13.0, 16.0);
-
 CF_ASSUME_NONNULL_END
 
 CF_IMPLICIT_BRIDGING_DISABLED
diff -ruN /Applications/Xcode_14.0.0-beta6.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/System/Library/Frameworks/CoreGraphics.framework/Headers/CoreGraphics.apinotes /Applications/Xcode_14.0.0-rc.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/System/Library/Frameworks/CoreGraphics.framework/Headers/CoreGraphics.apinotes
--- /Applications/Xcode_14.0.0-beta6.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/System/Library/Frameworks/CoreGraphics.framework/Headers/CoreGraphics.apinotes	2022-08-03 17:48:18.000000000 -0500
+++ /Applications/Xcode_14.0.0-rc.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/System/Library/Frameworks/CoreGraphics.framework/Headers/CoreGraphics.apinotes	2022-02-12 05:58:57.000000000 -0600
@@ -5,6 +5,64 @@
 # Global functions
 #
 Functions:
+# The below are inline functions that are irrelevant due to memberwise inits
+- Name: CGPointMake
+  Availability: nonswift
+  SwiftName: CGPoint.init(x:y:)
+- Name: CGSizeMake
+  Availability: nonswift
+  SwiftName: CGSize.init(width:height:)
+- Name: CGVectorMake
+  Availability: nonswift
+  SwiftName: CGVector.init(dx:dy:)
+- Name: CGRectMake
+  Availability: nonswift
+  SwiftName: CGRect.init(x:y:width:height:)
+- Name: CGAffineTransformMake
+  Availability: nonswift
+  SwiftName: CGAffineTransform.init(a:b:c:d:tx:ty:)
+# The below are fixups that inference didnt quite do what we wanted, and are
+# pulled over from what used to be in the overlays
+- Name: CGRectIsNull
+  SwiftName: "getter:CGRect.isNull(self:)"
+- Name: CGRectIsEmpty
+  SwiftName: "getter:CGRect.isEmpty(self:)"
+- Name: CGRectIsInfinite
+  SwiftName: "getter:CGRect.isInfinite(self:)"
+- Name: CGRectStandardize
+  SwiftName: "getter:CGRect.standardized(self:)"
+- Name: CGRectIntegral
+  SwiftName: "getter:CGRect.integral(self:)"
+- Name: CGRectInset
+  SwiftName: "CGRect.insetBy(self:dx:dy:)"
+- Name: CGRectOffset
+  SwiftName: "CGRect.offsetBy(self:dx:dy:)"
+- Name: CGRectUnion
+  SwiftName: "CGRect.union(self:_:)"
+- Name: CGRectIntersection
+  SwiftName: "CGRect.intersection(self:_:)"
+- Name: CGRectContainsRect
+  SwiftName: "CGRect.contains(self:_:)"
+- Name: CGRectContainsPoint
+  SwiftName: "CGRect.contains(self:_:)"
+- Name: CGRectIntersectsRect
+  SwiftName: "CGRect.intersects(self:_:)"
+- Name: CGRectGetMinX
+  SwiftName: getter:CGRect.minX(self:)
+- Name: CGRectGetMidX
+  SwiftName: getter:CGRect.midX(self:)
+- Name: CGRectGetMaxX
+  SwiftName: getter:CGRect.maxX(self:)
+- Name: CGRectGetMinY
+  SwiftName: getter:CGRect.minY(self:)
+- Name: CGRectGetMidY
+  SwiftName: getter:CGRect.midY(self:)
+- Name: CGRectGetMaxY
+  SwiftName: getter:CGRect.maxY(self:)
+- Name: CGRectGetWidth
+  SwiftName: getter:CGRect.width(self:)
+- Name: CGRectGetHeight
+  SwiftName: getter:CGRect.height(self:)
 # The below are not available in Swift
 # FIXME: empty-argument-label pattern is currently failing SILGen
 - Name: CGColorSpaceCreateDeviceGray
@@ -24,8 +82,36 @@
   Availability: nonswift
   SwiftName: CGColorConversionInfo.init(fromListWithArgumentsOptions:_:_:_:_:)
 
-# CGRect
-- Name: CGRectDivide
+# The below are attempts at providing better names than inference
+# CGAffineTransform
+- Name: CGAffineTransformMakeTranslation
+  SwiftName: CGAffineTransform.init(translationX:y:)
+- Name: CGAffineTransformMakeScale
+  SwiftName: CGAffineTransform.init(scaleX:y:)
+- Name: CGAffineTransformMakeRotation
+  SwiftName: CGAffineTransform.init(rotationAngle:)
+- Name: CGAffineTransformIsIdentity
+  SwiftName: getter:CGAffineTransform.isIdentity(self:)
+- Name: CGAffineTransformTranslate
+  SwiftName: CGAffineTransform.translatedBy(self:x:y:)
+- Name: CGAffineTransformScale
+  SwiftName: CGAffineTransform.scaledBy(self:x:y:)
+- Name: CGAffineTransformRotate
+  SwiftName: CGAffineTransform.rotated(self:by:)
+- Name: CGAffineTransformConcat
+  SwiftName: CGAffineTransform.concatenating(self:_:)
+- Name: CGAffineTransformInvert
+  SwiftName: CGAffineTransform.inverted(self:)
+- Name: CGPointApplyAffineTransform
+  SwiftName: CGPoint.applying(self:_:)
+- Name: CGSizeApplyAffineTransform
+  SwiftName: CGSize.applying(self:_:)
+- Name: CGRectApplyAffineTransform
+  SwiftName: CGRect.applying(self:_:)
+# These are hidden so we can improve them further in the SDK overlay
+- Name: CGAffineTransformEqualToTransform
+  # replaced by Equatable / ==
+  SwiftName: CGAffineTransform.__equalTo(self:_:)
   SwiftPrivate: true
 
 # CGBitmapContext
@@ -452,6 +538,37 @@
 - Name: CGFontCreateCopyWithVariations
   SwiftName: CGFont.copy(self:withVariations:)
 
+# CGGeometry
+- Name: CGPointCreateDictionaryRepresentation
+  SwiftName: getter:CGPoint.dictionaryRepresentation(self:)
+- Name: CGSizeCreateDictionaryRepresentation
+  SwiftName: getter:CGSize.dictionaryRepresentation(self:)
+- Name: CGRectCreateDictionaryRepresentation
+  SwiftName: getter:CGRect.dictionaryRepresentation(self:)
+- Name: CGPointEqualToPoint
+  SwiftName: CGPoint.equalTo(self:_:)
+- Name: CGSizeEqualToSize
+  SwiftName: CGSize.equalTo(self:_:)
+- Name: CGRectEqualToRect
+  SwiftName: CGRect.equalTo(self:_:)
+# These are hidden so we can improve them further in the SDK overlay
+- Name: CGRectDivide
+  # hide the pointer version in favor of the tuple-return version
+  SwiftName: CGRect.__divided(self:slice:remainder:atDistance:from:)
+  SwiftPrivate: true
+- Name: CGPointMakeWithDictionaryRepresentation
+  # hide in favor of an init (cant map to initializer because out-pointer)
+  SwiftName: CGPoint.__setFromDictionaryRepresentation(_:_:)
+  SwiftPrivate: true
+- Name: CGSizeMakeWithDictionaryRepresentation
+  # hide in favor of an init (cant map to initializer because out-pointer)
+  SwiftName: CGSize.__setFromDictionaryRepresentation(_:_:)
+  SwiftPrivate: true
+- Name: CGRectMakeWithDictionaryRepresentation
+  # hide in favor of an init (cant map to initializer because out-pointer)
+  SwiftName: CGRect.__setFromDictionaryRepresentation(_:_:)
+  SwiftPrivate: true
+
 # CGGradient
 - Name: CGGradientCreateWithColorComponents
   SwiftName: CGGradient.init(colorSpace:colorComponents:locations:count:)
@@ -608,36 +725,6 @@
   # replaced in favor of == / Equatable
   SwiftName: CGPath.__equalTo(self:_:)
   SwiftPrivate: true
-- Name: CGPathCreateCopyByNormalizing
-  SwiftName: CGPath.__normalized(self:eoFill:)
-  SwiftPrivate: true
-- Name: CGPathCreateCopyByUnioningPath
-  SwiftName: CGPath.__union(self:other:eoFill:)
-  SwiftPrivate: true
-- Name: CGPathCreateCopyByIntersectingPath
-  SwiftName: CGPath.__intersection(self:other:eoFill:)
-  SwiftPrivate: true
-- Name: CGPathCreateCopyBySubtractingPath
-  SwiftName: CGPath.__subtracting(self:other:eoFill:)
-  SwiftPrivate: true
-- Name: CGPathCreateCopyBySymmetricDifferenceOfPath
-  SwiftName: CGPath.__symmetricDifference(self:other:eoFill:)
-  SwiftPrivate: true
-- Name: CGPathCreateCopyOfLineBySubtractingPath
-  SwiftName: CGPath.__lineSubtracting(self:other:eoFill:)
-  SwiftPrivate: true
-- Name: CGPathCreateCopyOfLineByIntersectingPath
-  SwiftName: CGPath.__lineIntersection(self:other:eoFill:)
-  SwiftPrivate: true
-- Name: CGPathCreateSeparateComponents
-  SwiftName: CGPath.__componentsSeparated(self:eoFill:)
-  SwiftPrivate: true
-- Name: CGPathCreateCopyByFlattening
-  SwiftName: CGPath.__flattened(self:threshold:)
-  SwiftPrivate: true
-- Name: CGPathIntersectsPath
-  SwiftName: CGPath.__intersects(self:other:eoFill:)
-  SwiftPrivate: true
 - Name: CGPathAddRoundedRect
   SwiftName: CGMutablePath.__addRoundedRect(self:transform:rect:cornerWidth:cornerHeight:)
 - Name: CGPathMoveToPoint
@@ -1081,6 +1168,26 @@
 # Global variables
 #
 Globals:
+# The below are globals that are defined as opaque C constants for no good
+# reason.
+- Name: CGPointZero
+  Availability: nonswift
+  SwiftName: CGPoint.zero
+- Name: CGSizeZero
+  Availability: nonswift
+  SwiftName: CGSize.zero
+- Name: CGVectorZero
+  Availability: nonswift
+- Name: CGRectZero
+  Availability: nonswift
+  SwiftName: CGRect.zero
+- Name: CGAffineTransformIdentity
+  Availability: nonswift
+  SwiftName: CGAffineTransform.identity
+- Name: CGRectNull
+  SwiftName: CGRect.null
+- Name: CGRectInfinite
+  SwiftName: CGRect.infinite
 # The below are not available in Swift
 - Name: kCGColorSpaceGenericGray
   Availability: nonswift
@@ -1120,8 +1227,6 @@
   SwiftName: CGColorSpace.itur_709
 - Name: kCGColorSpaceITUR_709_PQ
   SwiftName: CGColorSpace.itur_709_PQ
-- Name: kCGColorSpaceITUR_709_HLG
-  SwiftName: CGColorSpace.itur_709_HLG
 - Name: kCGColorSpaceITUR_2020
   SwiftName: CGColorSpace.itur_2020
 - Name: kCGColorSpaceITUR_2020_sRGBGamma
@@ -1239,8 +1344,6 @@
 # CGContext
 - Name: kCGBlendModeXOR
   SwiftName: CGBlendMode.xor
-- Name: kCGBitmapByteOrderDefault
-  SwiftName: byteOrderDefault
 # CGEventTypes
 - Name: kCGEventMouseSubtypeDefault
   SwiftName: CGEventMouseSubtype.defaultType
Clone this wiki locally