From 43ad1b51355f9a54caf9bc034b346a1cd4196398 Mon Sep 17 00:00:00 2001 From: Michael Schneider Date: Wed, 11 Apr 2018 05:04:18 -0700 Subject: [PATCH 1/2] Define ASDISPLAYNODE_ASSERTIONS_ENABLED explicitly --- Source/Base/ASAssert.h | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Source/Base/ASAssert.h b/Source/Base/ASAssert.h index 336ac3d0e..636ef45f2 100644 --- a/Source/Base/ASAssert.h +++ b/Source/Base/ASAssert.h @@ -21,7 +21,11 @@ #import #import -#define ASDISPLAYNODE_ASSERTIONS_ENABLED (!defined(NS_BLOCK_ASSERTIONS)) +#if !defined(NS_BLOCK_ASSERTIONS) + #define ASDISPLAYNODE_ASSERTIONS_ENABLED 1 +#else + #define ASDISPLAYNODE_ASSERTIONS_ENABLED 0 +#endif /** * Note: In some cases it would be sufficient to do e.g.: From a8df5741720958c5c46bbe3e4aa018368453bdbf Mon Sep 17 00:00:00 2001 From: Michael Schneider Date: Wed, 11 Apr 2018 05:04:25 -0700 Subject: [PATCH 2/2] Add parameter type for drawRect: in ASDefaultPlaybackButton --- Source/Private/ASDefaultPlaybackButton.m | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Source/Private/ASDefaultPlaybackButton.m b/Source/Private/ASDefaultPlaybackButton.m index c2201b84a..bb5c8f539 100644 --- a/Source/Private/ASDefaultPlaybackButton.m +++ b/Source/Private/ASDefaultPlaybackButton.m @@ -46,15 +46,15 @@ - (void)setButtonType:(ASDefaultPlaybackButtonType)buttonType } } -- (nullable id)drawParametersForAsyncLayer:(_ASDisplayLayer *)layer +- (nullable NSDictionary *)drawParametersForAsyncLayer:(_ASDisplayLayer *)layer { return @{ - @"buttonType" : [NSNumber numberWithInt:_buttonType], + @"buttonType" : @(self.buttonType), @"color" : self.tintColor }; } -+ (void)drawRect:(CGRect)bounds withParameters:(id)parameters isCancelled:(asdisplaynode_iscancelled_block_t)isCancelledBlock isRasterizing:(BOOL)isRasterizing ++ (void)drawRect:(CGRect)bounds withParameters:(NSDictionary *)parameters isCancelled:(asdisplaynode_iscancelled_block_t)isCancelledBlock isRasterizing:(BOOL)isRasterizing { ASDefaultPlaybackButtonType buttonType = (ASDefaultPlaybackButtonType)[parameters[@"buttonType"] intValue]; UIColor *color = parameters[@"color"];