Skip to content

Commit 8b30af9

Browse files
committed
Fix the wrong convert of SDImageDecodeImageData
Do not just copy the code from SDImageCache without change the impl
1 parent d9b5dbc commit 8b30af9

File tree

1 file changed

+5
-19
lines changed

1 file changed

+5
-19
lines changed

SDWebImageYYPlugin/Classes/YYCache/YYCacheBridge/YYCache+SDAdditions.m

Lines changed: 5 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -79,20 +79,6 @@ @implementation YYCache (SDAdditions)
7979
}
8080

8181
- (id<SDWebImageOperation>)queryImageForKey:(NSString *)key options:(SDWebImageOptions)options context:(SDWebImageContext *)context cacheType:(SDImageCacheType)queryCacheType completion:(SDImageCacheQueryCompletionBlock)doneBlock {
82-
SDImageCacheOptions cacheOptions = 0;
83-
if (options & SDWebImageQueryMemoryData) cacheOptions |= SDImageCacheQueryMemoryData;
84-
if (options & SDWebImageQueryMemoryDataSync) cacheOptions |= SDImageCacheQueryMemoryDataSync;
85-
if (options & SDWebImageQueryDiskDataSync) cacheOptions |= SDImageCacheQueryDiskDataSync;
86-
if (options & SDWebImageScaleDownLargeImages) cacheOptions |= SDImageCacheScaleDownLargeImages;
87-
if (options & SDWebImageAvoidDecodeImage) cacheOptions |= SDImageCacheAvoidDecodeImage;
88-
if (options & SDWebImageDecodeFirstFrameOnly) cacheOptions |= SDImageCacheDecodeFirstFrameOnly;
89-
if (options & SDWebImagePreloadAllFrames) cacheOptions |= SDImageCachePreloadAllFrames;
90-
if (options & SDWebImageMatchAnimatedImageClass) cacheOptions |= SDImageCacheMatchAnimatedImageClass;
91-
92-
return [self queryCacheOperationForKey:key options:cacheOptions context:context cacheType:queryCacheType done:doneBlock];
93-
}
94-
95-
- (id<SDWebImageOperation>)queryCacheOperationForKey:(nullable NSString *)key options:(SDImageCacheOptions)options context:(nullable SDWebImageContext *)context cacheType:(SDImageCacheType)queryCacheType done:(nullable SDImageCacheQueryCompletionBlock)doneBlock {
9682
if (!key) {
9783
if (doneBlock) {
9884
doneBlock(nil, nil, SDImageCacheTypeNone);
@@ -114,7 +100,7 @@ @implementation YYCache (SDAdditions)
114100
}
115101

116102
if (image) {
117-
if (options & SDImageCacheDecodeFirstFrameOnly) {
103+
if (options & SDWebImageDecodeFirstFrameOnly) {
118104
// Ensure static image
119105
if (image.sd_isAnimated) {
120106
#if SD_MAC
@@ -123,7 +109,7 @@ @implementation YYCache (SDAdditions)
123109
image = [[UIImage alloc] initWithCGImage:image.CGImage scale:image.scale orientation:image.imageOrientation];
124110
#endif
125111
}
126-
} else if (options & SDImageCacheMatchAnimatedImageClass) {
112+
} else if (options & SDWebImageMatchAnimatedImageClass) {
127113
// Check image class matching
128114
Class animatedImageClass = image.class;
129115
Class desiredImageClass = context[SDWebImageContextAnimatedImageClass];
@@ -133,7 +119,7 @@ @implementation YYCache (SDAdditions)
133119
}
134120
}
135121

136-
BOOL shouldQueryMemoryOnly = (queryCacheType == SDImageCacheTypeMemory) || (image && !(options & SDImageCacheQueryMemoryData));
122+
BOOL shouldQueryMemoryOnly = (queryCacheType == SDImageCacheTypeMemory) || (image && !(options & SDWebImageQueryMemoryData));
137123
if (shouldQueryMemoryOnly) {
138124
if (doneBlock) {
139125
doneBlock(image, nil, SDImageCacheTypeMemory);
@@ -147,8 +133,8 @@ @implementation YYCache (SDAdditions)
147133
// Check whether we need to synchronously query disk
148134
// 1. in-memory cache hit & memoryDataSync
149135
// 2. in-memory cache miss & diskDataSync
150-
BOOL shouldQueryDiskSync = ((image && options & SDImageCacheQueryMemoryDataSync) ||
151-
(!image && options & SDImageCacheQueryDiskDataSync));
136+
BOOL shouldQueryDiskSync = ((image && options & SDWebImageQueryMemoryDataSync) ||
137+
(!image && options & SDWebImageQueryDiskDataSync));
152138
NSData* (^queryDiskDataBlock)(void) = ^NSData* {
153139
@synchronized (operation) {
154140
if (operation.isCancelled) {

0 commit comments

Comments
 (0)