Skip to content

fix: use source image for synchronized correct #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: patched-3.0
Choose a base branch
from
Open

fix: use source image for synchronized correct #5

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2d72523
fix: use source image for synchronized correct
mcfans Apr 21, 2022
7cb67e2
fix: typo
mcfans Apr 21, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 13 additions & 3 deletions Source/ASImageNode.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -456,6 +456,7 @@ + (UIImage *)displayWithParameters:(id<NSObject>)parameter isCancelled:(NS_NOESC
}

static ASWeakMap<ASImageNodeContentsKey *, UIImage *> *cache = nil;
static ASWeakMap<ASImageNodeContentsKey *, UIImage *> *workingKeySourceImageMap = nil;

+ (ASWeakMapEntry *)contentsForkey:(ASImageNodeContentsKey *)key drawParameters:(id)drawParameters isCancelled:(asdisplaynode_iscancelled_block_t)isCancelled
{
Expand All @@ -464,20 +465,29 @@ + (ASWeakMapEntry *)contentsForkey:(ASImageNodeContentsKey *)key drawParameters:
dispatch_once(&onceToken, ^{
cacheLock = new AS::Mutex();
});

UIImage *sourceImage = key.image;

{
AS::MutexLocker l(*cacheLock);
if (!cache) {
cache = [[ASWeakMap alloc] init];
workingKeySourceImageMap = [[ASWeakMap alloc] init];
}
ASWeakMapEntry *entry = [cache entryForKey:key];
if (entry != nil) {
return entry;
}
ASWeakMapEntry *sourceImageEntry = [workingKeySourceImageMap entryForKey: key];
if (sourceImageEntry != nil) {
sourceImage = sourceImageEntry.value;
} else {
[workingKeySourceImageMap setObject:sourceImage forKey:key];
}
}

// cache miss
UIImage *contents = [self createContentsForkey:key drawParameters:drawParameters isCancelled:isCancelled];
UIImage *contents = [self createContentsForkey:key sourceImage:sourceImage drawParameters:drawParameters isCancelled:isCancelled];
if (contents == nil) { // If nil, we were cancelled
return nil;
}
Expand All @@ -488,7 +498,7 @@ + (ASWeakMapEntry *)contentsForkey:(ASImageNodeContentsKey *)key drawParameters:
}
}

+ (UIImage *)createContentsForkey:(ASImageNodeContentsKey *)key drawParameters:(id)parameter isCancelled:(asdisplaynode_iscancelled_block_t)isCancelled
+ (UIImage *)createContentsForkey:(ASImageNodeContentsKey *)key sourceImage:(UIImage *)sourceImage drawParameters:(id)parameter isCancelled:(asdisplaynode_iscancelled_block_t)isCancelled
{
// The following `ASGraphicsCreateImage` call will sometimes take take longer than 5ms on an
// A5 processor for a 400x800 backingSize.
Expand Down Expand Up @@ -537,7 +547,7 @@ + (UIImage *)createContentsForkey:(ASImageNodeContentsKey *)key drawParameters:(
[key.tintColor setFill];
}

@synchronized(image) {
@synchronized(sourceImage) {
[image drawInRect:key.imageDrawRect blendMode:blendMode alpha:1];
}

Expand Down