From 14aea9ee58b70278ca2fc6ece17d0c4f4aa33929 Mon Sep 17 00:00:00 2001 From: Mattt Thompson Date: Sun, 8 Apr 2012 14:26:52 -0700 Subject: [PATCH] [Issue #268] Reverting to cacheing UIImages rather than NSPurgeableData-wrapped image data --- AFNetworking/UIImageView+AFNetworking.m | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/AFNetworking/UIImageView+AFNetworking.m b/AFNetworking/UIImageView+AFNetworking.m index 9f9d190..5310e71 100644 --- a/AFNetworking/UIImageView+AFNetworking.m +++ b/AFNetworking/UIImageView+AFNetworking.m @@ -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