evie/AFNetworking
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[Issue #268] Reverting to cacheing UIImages rather than NSPurgeableData-wrapped image data

Browse source
This commit is contained in:
Mattt Thompson 2012-04-08 14:26:52 -07:00
parent 6923e31db5
commit 14aea9ee58
1 changed files with 7 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
AFNetworking/UIImageView+AFNetworking.m
View file

@ -28,8 +28,8 @@
@interface AFImageCache : NSCache
- (UIImage *)cachedImageForRequest:(NSURLRequest *)request;
- (void)cacheImageData:(NSData *)imageData
forRequest:(NSURLRequest *)request;
- (void)cacheImage:(UIImage *)image
forRequest:(NSURLRequest *)request;
@end
#pragma mark -
@ -121,7 +121,7 @@ static char kAFImageRequestOperationObjectKey;
success(operation.request, operation.response, responseObject);
}
[[[self class] af_sharedImageCache] cacheImageData:operation.responseData forRequest:urlRequest];
[[[self class] af_sharedImageCache] cacheImage:responseObject forRequest:urlRequest];
self.af_imageRequestOperation = nil;
} failure:^(AFHTTPRequestOperation *operation, NSError *error) {
@ -162,18 +162,13 @@ static inline NSString * AFImageCacheKeyFromURLRequest(NSURLRequest *request) {
break;
}
UIImage *image = [UIImage imageWithData:[self objectForKey:AFImageCacheKeyFromURLRequest(request)]];
if (image) {
return [UIImage imageWithCGImage:[image CGImage] scale:[[UIScreen mainScreen] scale] orientation:image.imageOrientation];
}
return image;
return [self objectForKey:AFImageCacheKeyFromURLRequest(request)];
}
- (void)cacheImageData:(NSData *)imageData
forRequest:(NSURLRequest *)request
- (void)cacheImage:(UIImage *)image
forRequest:(NSURLRequest *)request
{
[self setObject:[NSPurgeableData dataWithData:imageData] forKey:AFImageCacheKeyFromURLRequest(request)];
[self setObject:image forKey:AFImageCacheKeyFromURLRequest(request)];
}
@end