Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master' into feature/add-pin-r…
Browse files Browse the repository at this point in the history
…emote-image-to-iglistkit
  • Loading branch information
MussaCharles committed May 29, 2022
2 parents 71d149f + 50426db commit 20ac5b3
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 0 deletions.
4 changes: 4 additions & 0 deletions Source/Private/ASInternalHelpers.h
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,10 @@ NS_ASSUME_NONNULL_BEGIN
ASDK_EXTERN void ASInitializeFrameworkMainThreadOnConstructor(void);
ASDK_EXTERN void ASInitializeFrameworkMainThreadOnDestructor(void);

// Calls both ASInitializeFrameworkMainThreadOnConstructor and ASInitializeFrameworkMainThreadOnDestructor
// Used when manually initializing texture
ASDK_EXTERN void ASInitializeFrameworkMainThread(void);

ASDK_EXTERN BOOL ASDefaultAllowsGroupOpacity(void);
ASDK_EXTERN BOOL ASDefaultAllowsEdgeAntialiasing(void);

Expand Down
6 changes: 6 additions & 0 deletions Source/Private/ASInternalHelpers.mm
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,12 @@ void ASInitializeFrameworkMainThreadOnDestructor(void)
});
}

ASDK_EXTERN void ASInitializeFrameworkMainThread(void)
{
ASInitializeFrameworkMainThreadOnConstructor();
ASInitializeFrameworkMainThreadOnDestructor();
}

BOOL ASSubclassOverridesSelector(Class superclass, Class subclass, SEL selector)
{
if (superclass == subclass) return NO; // Even if the class implements the selector, it doesn't override itself.
Expand Down

0 comments on commit 20ac5b3

Please sign in to comment.