mirrors
/
SDWebImage
mirror of https://github.com/SDWebImage/SDWebImage.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3281 from SDWebImage/revert-3276-fix-get-image-source-crash 

Revert "Fix image source release in iOS 15"
This commit is contained in:
Kinarobin 2021-10-09 15:16:22 +08:00 committed by GitHub
parent d0f27eb9af a3f5647517
commit 7425221108
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
SDWebImage/Core/SDImageIOAnimatedCoder.m
View File

@ -437,14 +437,7 @@ static NSString * kSDCGImageDestinationRequestedFileSize = @"kCGImageDestination
if (scaleFactor != nil) {
scale = MAX([scaleFactor doubleValue], 1);
}
CGImageSourceRef imageSource = _imageSource;
if (imageSource != NULL) {
CFRetain(imageSource);
} else {
return nil;
}
image = [self.class createFrameAtIndex:0 source:imageSource scale:scale preserveAspectRatio:_preserveAspectRatio thumbnailSize:_thumbnailSize options:nil];
CFRelease(imageSource);
image = [self.class createFrameAtIndex:0 source:_imageSource scale:scale preserveAspectRatio:_preserveAspectRatio thumbnailSize:_thumbnailSize options:nil];
if (image) {
image.sd_imageFormat = self.class.imageFormat;
}
@ -657,14 +650,7 @@ static NSString * kSDCGImageDestinationRequestedFileSize = @"kCGImageDestination
(__bridge NSString *)kCGImageSourceShouldCacheImmediately : @(YES),
(__bridge NSString *)kCGImageSourceShouldCache : @(YES) // Always cache to reduce CPU usage
};
CGImageSourceRef imageSource = _imageSource;
if (imageSource != NULL) {
CFRetain(imageSource);
} else {
return nil;
}
UIImage *image = [self.class createFrameAtIndex:index source:imageSource scale:_scale preserveAspectRatio:_preserveAspectRatio thumbnailSize:_thumbnailSize options:options];
CFRelease(imageSource);
UIImage *image = [self.class createFrameAtIndex:index source:_imageSource scale:_scale preserveAspectRatio:_preserveAspectRatio thumbnailSize:_thumbnailSize options:options];
if (!image) {
return nil;
}