Skip to content

Commit 08ec6cf

Browse files
committed
Adjustment for manager && cache call, add deprecation
1 parent 246cfa9 commit 08ec6cf

File tree

2 files changed

+14
-16
lines changed

2 files changed

+14
-16
lines changed

SDWebImage/Core/SDImageCacheDefine.h

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ FOUNDATION_EXPORT void SDSetDecodeOptionsToContext(SDWebImageMutableContext * _N
122122
imageData:(nullable NSData *)imageData
123123
forKey:(nullable NSString *)key
124124
cacheType:(SDImageCacheType)cacheType
125-
completion:(nullable SDWebImageNoParamsBlock)completionBlock API_DEPRECATED_WITH_REPLACEMENT("storeImage:imageData:forKey:options:context:cacheType:completion:", macos(10.10, API_TO_BE_DEPRECATED), ios(8.0, API_TO_BE_DEPRECATED), tvos(9.0, API_TO_BE_DEPRECATED), watchos(2.0, API_TO_BE_DEPRECATED));;
125+
completion:(nullable SDWebImageNoParamsBlock)completionBlock API_DEPRECATED_WITH_REPLACEMENT("storeImage:imageData:forKey:options:context:cacheType:completion:", macos(10.10, API_TO_BE_DEPRECATED), ios(8.0, API_TO_BE_DEPRECATED), tvos(9.0, API_TO_BE_DEPRECATED), watchos(2.0, API_TO_BE_DEPRECATED));
126126

127127
@optional
128128
/**
@@ -144,7 +144,7 @@ FOUNDATION_EXPORT void SDSetDecodeOptionsToContext(SDWebImageMutableContext * _N
144144
cacheType:(SDImageCacheType)cacheType
145145
completion:(nullable SDWebImageNoParamsBlock)completionBlock;
146146

147-
@required
147+
#pragma mark - Deprecated because SDWebImageManager does not use these APIs
148148
/**
149149
Remove the image from image cache for the given key. If cache type is memory only, completion is called synchronously, else asynchronously.
150150
@@ -154,7 +154,7 @@ FOUNDATION_EXPORT void SDSetDecodeOptionsToContext(SDWebImageMutableContext * _N
154154
*/
155155
- (void)removeImageForKey:(nullable NSString *)key
156156
cacheType:(SDImageCacheType)cacheType
157-
completion:(nullable SDWebImageNoParamsBlock)completionBlock;
157+
completion:(nullable SDWebImageNoParamsBlock)completionBlock API_DEPRECATED("No longer use. Cast to cache instance and call its API", macos(10.10, API_TO_BE_DEPRECATED), ios(8.0, API_TO_BE_DEPRECATED), tvos(9.0, API_TO_BE_DEPRECATED), watchos(2.0, API_TO_BE_DEPRECATED));
158158

159159
/**
160160
Check if image cache contains the image for the given key (does not load the image). If image is cached in memory, completion is called synchronously, else asynchronously.
@@ -165,7 +165,7 @@ FOUNDATION_EXPORT void SDSetDecodeOptionsToContext(SDWebImageMutableContext * _N
165165
*/
166166
- (void)containsImageForKey:(nullable NSString *)key
167167
cacheType:(SDImageCacheType)cacheType
168-
completion:(nullable SDImageCacheContainsCompletionBlock)completionBlock;
168+
completion:(nullable SDImageCacheContainsCompletionBlock)completionBlock API_DEPRECATED("No longer use. Cast to cache instance and call its API", macos(10.10, API_TO_BE_DEPRECATED), ios(8.0, API_TO_BE_DEPRECATED), tvos(9.0, API_TO_BE_DEPRECATED), watchos(2.0, API_TO_BE_DEPRECATED));
169169

170170
/**
171171
Clear all the cached images for image cache. If cache type is memory only, completion is called synchronously, else asynchronously.
@@ -174,6 +174,6 @@ FOUNDATION_EXPORT void SDSetDecodeOptionsToContext(SDWebImageMutableContext * _N
174174
@param completionBlock A block executed after the operation is finished
175175
*/
176176
- (void)clearWithCacheType:(SDImageCacheType)cacheType
177-
completion:(nullable SDWebImageNoParamsBlock)completionBlock;
177+
completion:(nullable SDWebImageNoParamsBlock)completionBlock API_DEPRECATED("No longer use. Cast to cache instance and call its API", macos(10.10, API_TO_BE_DEPRECATED), ios(8.0, API_TO_BE_DEPRECATED), tvos(9.0, API_TO_BE_DEPRECATED), watchos(2.0, API_TO_BE_DEPRECATED));
178178

179179
@end

SDWebImage/Core/SDWebImageManager.m

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -499,18 +499,16 @@ - (void)callTransformProcessForOperation:(nonnull SDWebImageCombinedOperation *)
499499
}
500500

501501
if (shouldTransformImage) {
502+
// transformed cache key
503+
NSString *key = [self cacheKeyForURL:url context:context];
502504
dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_HIGH, 0), ^{
503-
@autoreleasepool {
504-
// transformed cache key
505-
NSString *key = [self cacheKeyForURL:url context:context];
506-
// Case that transformer on thumbnail, which this time need full pixel image
507-
UIImage *transformedImage = [transformer transformedImageWithImage:cacheImage forKey:key];
508-
if (transformedImage) {
509-
transformedImage.sd_isTransformed = YES;
510-
[self callStoreOriginCacheProcessForOperation:operation url:url options:options context:context originalImage:originalImage cacheImage:transformedImage originalData:originalData cacheData:nil cacheType:cacheType finished:finished completed:completedBlock];
511-
} else {
512-
[self callStoreOriginCacheProcessForOperation:operation url:url options:options context:context originalImage:originalImage cacheImage:cacheImage originalData:originalData cacheData:cacheData cacheType:cacheType finished:finished completed:completedBlock];
513-
}
505+
// Case that transformer on thumbnail, which this time need full pixel image
506+
UIImage *transformedImage = [transformer transformedImageWithImage:cacheImage forKey:key];
507+
if (transformedImage) {
508+
transformedImage.sd_isTransformed = YES;
509+
[self callStoreOriginCacheProcessForOperation:operation url:url options:options context:context originalImage:originalImage cacheImage:transformedImage originalData:originalData cacheData:nil cacheType:cacheType finished:finished completed:completedBlock];
510+
} else {
511+
[self callStoreOriginCacheProcessForOperation:operation url:url options:options context:context originalImage:originalImage cacheImage:cacheImage originalData:originalData cacheData:cacheData cacheType:cacheType finished:finished completed:completedBlock];
514512
}
515513
});
516514
} else {

0 commit comments

Comments
 (0)