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

Fix the case when previous pipeline use thumbnail transformer use together, second pipeline use the full size loading

This commit is contained in:
DreamPiggy 2022-06-23 19:37:13 +08:00
parent 2c9290f109
commit 911328c1b4
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
SDWebImage/Core/SDWebImageManager.m
View File

@ -575,9 +575,16 @@ static id<SDImageLoader> _defaultImageLoader;
@autoreleasepool {
// transformed/thumbnailed cache key
NSString *key = [self cacheKeyForURL:url context:context];
UIImage *transformedImage = [transformer transformedImageWithImage:originalImage forKey:key];
// Case that transformer one thumbnail, which this time need full pixel image
UIImage *fullSizeImage = originalImage;
if (shouldDecodeFullImage) {
SDWebImageMutableContext *tempContext = [context mutableCopy];
tempContext[SDWebImageContextImageThumbnailPixelSize] = nil;
fullSizeImage = SDImageCacheDecodeImageData(originalData, key, options, tempContext) ?: originalImage;
}
UIImage *transformedImage = [transformer transformedImageWithImage:fullSizeImage forKey:key];
if (transformedImage && finished) {
BOOL imageWasTransformed = ![transformedImage isEqual:originalImage];
BOOL imageWasTransformed = ![transformedImage isEqual:fullSizeImage];
NSData *cacheData;
// pass nil if the image was transformed, so we can recalculate the data from the image
if (cacheSerializer && (storeCacheType == SDImageCacheTypeDisk || storeCacheType == SDImageCacheTypeAll)) {
@ -589,7 +596,7 @@ static id<SDImageLoader> _defaultImageLoader;
[self callStoreTransformCacheProcessForOperation:operation url:url options:options context:context image:transformedImage data:cacheData cacheType:cacheType transformed:imageWasTransformed finished:finished completed:completedBlock];
} else {
// Continue store transform cache process
[self callStoreTransformCacheProcessForOperation:operation url:url options:options context:context image:originalImage data:originalData cacheType:cacheType transformed:NO finished:finished completed:completedBlock];
[self callStoreTransformCacheProcessForOperation:operation url:url options:options context:context image:fullSizeImage data:originalData cacheType:cacheType transformed:NO finished:finished completed:completedBlock];
}
}
});
@ -601,9 +608,9 @@ static id<SDImageLoader> _defaultImageLoader;
// disable thumbnail decoding
SDWebImageMutableContext *tempContext = [context mutableCopy];
tempContext[SDWebImageContextImageThumbnailPixelSize] = nil;
UIImage *originalImage = SDImageCacheDecodeImageData(originalData, key, options, tempContext);
UIImage *fullSizeImage = SDImageCacheDecodeImageData(originalData, key, options, tempContext) ?: originalImage;
// Continue store transform cache process
[self callStoreTransformCacheProcessForOperation:operation url:url options:options context:context image:originalImage data:originalData cacheType:cacheType transformed:NO finished:finished completed:completedBlock];
[self callStoreTransformCacheProcessForOperation:operation url:url options:options context:context image:fullSizeImage data:originalData cacheType:cacheType transformed:NO finished:finished completed:completedBlock];
}
});
} else {