Revert "Fix image source release in iOS 15"

This commit is contained in:
Kinarobin 2021-10-07 10:20:00 +08:00 committed by GitHub
parent d636743952
commit a3f5647517
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 16 deletions

View File

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