From 1b3f5e08341733668de969130ec541f90200c469 Mon Sep 17 00:00:00 2001 From: Greg Bolsinga Date: Fri, 21 Aug 2020 11:12:39 -0700 Subject: [PATCH 1/2] Do not expose tgmath.h to all clients of Texture - tgmath.h #undef the `log` macro for mathematical reasons. Code that may also use a log name (such as CocoaLumberjack) will get confused by this when they try to use `NS_SWIFT_NAME` with `log` as part of the name. - `ABS` from NSObjCRuntime.h is what is typically used for abs on `CGFloat`. - Note: removing tgmath.h from the Texture umbrella header may expose clients that implicitly depended upon it being imported. Sources may have to be updated after this to `#import ` explicitly. --- Source/Details/CoreGraphics+ASConvenience.h | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/Source/Details/CoreGraphics+ASConvenience.h b/Source/Details/CoreGraphics+ASConvenience.h index a0805f170..c14785cb4 100644 --- a/Source/Details/CoreGraphics+ASConvenience.h +++ b/Source/Details/CoreGraphics+ASConvenience.h @@ -8,10 +8,7 @@ // #import - #import -#import - #import @@ -45,7 +42,7 @@ ASDISPLAYNODE_INLINE CGFloat ASCGFloatFromNumber(NSNumber *number) ASDISPLAYNODE_INLINE BOOL CGSizeEqualToSizeWithIn(CGSize size1, CGSize size2, CGFloat delta) { - return fabs(size1.width - size2.width) < delta && fabs(size1.height - size2.height) < delta; + return ABS(size1.width - size2.width) < delta && fabs(size1.height - size2.height) < delta; }; NS_ASSUME_NONNULL_END From 13048290a470d5519ca103828482e1a7de242a7d Mon Sep 17 00:00:00 2001 From: Greg Bolsinga Date: Fri, 21 Aug 2020 12:41:48 -0700 Subject: [PATCH 2/2] get all the ABS --- Source/Details/CoreGraphics+ASConvenience.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/Details/CoreGraphics+ASConvenience.h b/Source/Details/CoreGraphics+ASConvenience.h index c14785cb4..e1e96033a 100644 --- a/Source/Details/CoreGraphics+ASConvenience.h +++ b/Source/Details/CoreGraphics+ASConvenience.h @@ -42,7 +42,7 @@ ASDISPLAYNODE_INLINE CGFloat ASCGFloatFromNumber(NSNumber *number) ASDISPLAYNODE_INLINE BOOL CGSizeEqualToSizeWithIn(CGSize size1, CGSize size2, CGFloat delta) { - return ABS(size1.width - size2.width) < delta && fabs(size1.height - size2.height) < delta; + return ABS(size1.width - size2.width) < delta && ABS(size1.height - size2.height) < delta; }; NS_ASSUME_NONNULL_END