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

Add a better check to handle the cases when call `storeImage` without imageData. Firstly check SDAnimatedImage, then check sd_imageFormat.

This commit is contained in:
DreamPiggy 2020-03-01 18:38:40 +08:00
parent f4548bba5c
commit 3df399508e
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
SDWebImage/Core/SDImageCache.m
View File

@ -187,13 +187,20 @@
dispatch_async(self.ioQueue, ^{ dispatch_async(self.ioQueue, ^{
@autoreleasepool { @autoreleasepool {
NSData *data = imageData; NSData *data = imageData;
if (!data && [image conformsToProtocol:@protocol(SDAnimatedImage)]) {
// If image is custom animated image class, prefer its original animated data
data = [((id<SDAnimatedImage>)image) animatedImageData];
}
if (!data && image) { if (!data && image) {
// If we do not have any data to detect image format, check whether it contains alpha channel to use PNG or JPEG format // Check image's associated image format, may return .undefined
SDImageFormat format; SDImageFormat format = image.sd_imageFormat;
if ([SDImageCoderHelper CGImageContainsAlpha:image.CGImage]) { if (format == SDImageFormatUndefined) {
format = SDImageFormatPNG; // If we do not have any data to detect image format, check whether it contains alpha channel to use PNG or JPEG format
} else { if ([SDImageCoderHelper CGImageContainsAlpha:image.CGImage]) {
format = SDImageFormatJPEG; format = SDImageFormatPNG;
} else {
format = SDImageFormatJPEG;
}
} }
data = [[SDImageCodersManager sharedManager] encodedDataWithImage:image format:format options:nil]; data = [[SDImageCodersManager sharedManager] encodedDataWithImage:image format:format options:nil];
} }