diff --git a/SDWebImage/SDImageCache.h b/SDWebImage/SDImageCache.h index 1bb5b7cd..5275258a 100644 --- a/SDWebImage/SDImageCache.h +++ b/SDWebImage/SDImageCache.h @@ -31,24 +31,19 @@ typedef NS_OPTIONS(NSUInteger, SDImageCacheOptions) { * images to a size compatible with the constrained memory of devices. */ SDImageCacheScaleDownLargeImages = 1 << 3, - /** - * We usually don't apply transform on animated images as most transformers could not manage animated images. - * Use this flag to transform them anyway. - */ - SDImageCacheTransformAnimatedImage = 1 << 4, /** * By default, we will decode the image in the background during cache query and download from the network. This can help to improve performance because when rendering image on the screen, it need to be firstly decoded. But this happen on the main queue by Core Animation. * However, this process may increase the memory usage as well. If you are experiencing a issue due to excessive memory consumption, This flag can prevent decode the image. */ - SDImageCacheAvoidDecodeImage = 1 << 5, + SDImageCacheAvoidDecodeImage = 1 << 4, /** * By default, we decode the animated image. This flag can force decode the first frame only and produece the static image. */ - SDImageCacheDecodeFirstFrameOnly = 1 << 6, + SDImageCacheDecodeFirstFrameOnly = 1 << 5, /** * By default, for `SDAnimatedImage`, we decode the animated image frame during rendering to reduce memory usage. This flag actually trigger `preloadAllAnimatedImageFrames = YES` after image load from disk cache */ - SDImageCachePreloadAllFrames = 1 << 7 + SDImageCachePreloadAllFrames = 1 << 6 }; /** diff --git a/SDWebImage/SDImageCache.m b/SDWebImage/SDImageCache.m index 00744d8e..3ae01792 100644 --- a/SDWebImage/SDImageCache.m +++ b/SDWebImage/SDImageCache.m @@ -588,7 +588,8 @@ if (options & SDWebImageQueryMemoryData) cacheOptions |= SDImageCacheQueryMemoryData; if (options & SDWebImageQueryMemoryDataSync) cacheOptions |= SDImageCacheQueryMemoryDataSync; if (options & SDWebImageQueryDiskDataSync) cacheOptions |= SDImageCacheQueryDiskDataSync; - if (options & SDWebImageTransformAnimatedImage) cacheOptions |= SDImageCacheTransformAnimatedImage; + if (options & SDWebImageScaleDownLargeImages) cacheOptions |= SDImageCacheScaleDownLargeImages; + if (options & SDWebImageAvoidDecodeImage) cacheOptions |= SDImageCacheAvoidDecodeImage; if (options & SDWebImageDecodeFirstFrameOnly) cacheOptions |= SDImageCacheDecodeFirstFrameOnly; if (options & SDWebImagePreloadAllFrames) cacheOptions |= SDImageCachePreloadAllFrames; return [self queryCacheOperationForKey:key options:cacheOptions context:context done:completionBlock]; diff --git a/SDWebImage/SDImageCodersManager.m b/SDWebImage/SDImageCodersManager.m index c1378d1d..33e1856f 100644 --- a/SDWebImage/SDImageCodersManager.m +++ b/SDWebImage/SDImageCodersManager.m @@ -15,7 +15,6 @@ #endif #import "NSImage+Compatibility.h" #import "UIImage+WebCache.h" -#import "SDWebImageDefine.h" #define LOCK(lock) dispatch_semaphore_wait(lock, DISPATCH_TIME_FOREVER); #define UNLOCK(lock) dispatch_semaphore_signal(lock);