2.0 compat

README.md

@@ -8,55 +8,21 @@ It provides:
 - An UIImageView category adding web image and cache management to the Cocoa Touch framework
 - An asynchronous image downloader
 - An asynchronous memory + disk image caching with automatic cache expiration handling
+- A background image decompression
 - A guarantee that the same URL won't be downloaded several times
 - A guarantee that bogus URLs won't be retried again and again
+- A guarantee that main thread will never be blocked
 - Performances!
 
-Motivation
+[How is SDWebImage better than X?](https://github.com/rs/SDWebImage/wiki/How-is-SDWebImage-better-than-X%3F)
+
+Who Use It
 ----------
 
-As a dummy Objective-C developer working on my first iPhone application for my company
-([Dailymotion][]), I've been very frustrated by the lack of support in the Cocoa Touch framework for
-UITableView with remote images. After some Googling, I found lot of forums and blogs coming up with
-their solution, most of the time based on asynchronous usage with NSURLConnection, but none provided
-a simple library doing the work of async image grabbing + caching for you.
-
-Actually there is one in the famous [Three20][] framework by [Joe Hewitt][], but it's a massive
-and undocumented piece of code. You can't import just the the libraries you want without taking the
-whole framework (damn #import "TTGlobal.h"). Anyway, the [Three20][] implementation is based on
-NSURLConnection, and I soon discovered this solution wasn't ideal. Keep reading to find out why.
-
-As a hurried beginner in iPhone development, I couldn't attempt to implement my own async image
-grabber with caching support as my first steps in this new world. Thus, I asked for help from my good
-friend Sebastien Flory ([Fraggle][]), who was working on his great iPhone game ([Urban Rivals][], a
-future app-store hit) for almost a year. He spent quite an amount of time implementing the very
-same solution for his needs, and was kind enough to give me his implementation for my own use. This
-worked quite well and allowed me to concentrate on other parts of my application. But when I started
-to compare my application with its direct competitor - the built-in Youtube application - I was very
-unhappy with the loading speed of the images. After some network sniffing, I found that every HTTP
-requests for my images was 10 times slower than Youtube's... On my own network, Youtube was 10
-time faster than my own servers... WTF??
-
-In fact, my servers were fine but a lot of latency was added to the requests, certainly because my
-application wasn't responsive enough to handle the requests at full speed. Right then, I
-understood something important, asynchronous NSURLConnections are tied to the main runloop in the
-NSEventTrackingRunLoopMode. As explained in the documentation, this runloop mode is affected by
-UI events:
-
-> Cocoa uses this mode to restrict incoming events during mouse-dragging loops and other sorts of
-> user interface tracking loops.
-
-A simple test to recognize an application using NSURLConnection in its default mode to load
-remote images is to scroll the UITableView with your finger to disclose an unloaded image, and to
-keep your finger pressed on the screen. If the image doesn't load until you release you finger,
-you've got one (try with the Facebook app for instance). It took me quite some time to understand
-the reason for this lagging issue. Actually I first used NSOperation to workaround this issue.
-
-This technique combined with an image cache instantly gave a lot of responsiveness to my app.
-I thought this library could benefit other Cocoa Touch applications so I open-sourced it.
-
-How To Use It
--------------
+Find out [who use SDWebImage](https://github.com/rs/SDWebImage/wiki/Who-Use-SDWebImage) and add your app to the list.
+
+How To Use
+----------
 
 API documentation is available at [http://hackemist.com/SDWebImage/doc/](http://hackemist.com/SDWebImage/doc/)
 
@@ -253,9 +219,6 @@ Future Enhancements
 
 - LRU memory cache cleanup instead of reset on memory warning
 
-[Dailymotion]: http://www.dailymotion.com
-[Fraggle]: http://fraggle.squarespace.com
-[Urban Rivals]: http://fraggle.squarespace.com/blog/2009/9/15/almost-done-here-is-urban-rivals-iphone-trailer.html
-[Three20]: http://groups.google.com/group/three20
-[Joe Hewitt]: http://www.joehewitt.com
-[tutorial]: http://blog.carbonfive.com/2011/04/04/using-open-source-static-libraries-in-xcode-4
+## Licenses
+
+All source code is licensed under the [MIT License](https://raw.github.com/rs/SDWebImage/master/LICENSE).

SDWebImage/MKAnnotationView+WebCache.m

@@ -64,7 +64,10 @@ - (void)setImageWithURL:(NSURL *)url placeholderImage:(UIImage *)placeholder opt
 
 - (void)cancelCurrentImageLoad
 {
-    [[SDWebImageManager sharedManager] cancelForDelegate:self];
+    @synchronized(self)
+    {
+        [[SDWebImageManager sharedManager] cancelForDelegate:self];
+    }
 }
 
 - (void)webImageManager:(SDWebImageManager *)imageManager didProgressWithPartialImage:(UIImage *)image forURL:(NSURL *)url

SDWebImage/SDWebImageCompat.h

@@ -83,7 +83,7 @@ NS_INLINE UIImage *SDScaledImageForPath(NSString *path, NSObject *imageOrData)
             }
         }
 
-        UIImage *scaledImage = [[UIImage alloc] initWithCGImage:image.CGImage scale:scale orientation:UIImageOrientationUp];
+        UIImage *scaledImage = [[UIImage alloc] initWithCGImage:image.CGImage scale:scale orientation:image.imageOrientation];
         SDWISafeRelease(image)
         image = scaledImage;
     }

SDWebImage/SDWebImageDecoder.m

@@ -96,37 +96,18 @@ @implementation UIImage (ForceDecode)
 
 + (UIImage *)decodedImageWithImage:(UIImage *)image
 {
-    CGImageRef imageRef = image.CGImage;
-    CGColorSpaceRef colorSpace = CGColorSpaceCreateDeviceRGB();
-    CGImageAlphaInfo alphaInfo = CGImageGetAlphaInfo(imageRef);
-
+    CGImageAlphaInfo alphaInfo = CGImageGetAlphaInfo(image.CGImage);
     BOOL imageHasAlphaInfo = (alphaInfo != kCGImageAlphaNone &&
                               alphaInfo != kCGImageAlphaNoneSkipFirst &&
                               alphaInfo != kCGImageAlphaNoneSkipLast);
 
-    int bytesPerPixel = alphaInfo != kCGImageAlphaNone ? 4 : 3;
-    CGBitmapInfo bitmapInfo = imageHasAlphaInfo ? kCGImageAlphaPremultipliedLast : alphaInfo;
-
-    CGContextRef context = CGBitmapContextCreate(NULL,
-                                                 CGImageGetWidth(imageRef),
-                                                 CGImageGetHeight(imageRef),
-                                                 8,
-                                                 // Just always return width * bytesPerPixel will be enough
-                                                 CGImageGetWidth(imageRef) * bytesPerPixel,
-                                                 // System only supports RGB, set explicitly
-                                                 colorSpace,
-                                                 bitmapInfo);
-    CGColorSpaceRelease(colorSpace);
-    if (!context) return nil;
-
-    CGRect rect = (CGRect){CGPointZero,{CGImageGetWidth(imageRef), CGImageGetHeight(imageRef)}};
-    CGContextDrawImage(context, rect, imageRef);
-    CGImageRef decompressedImageRef = CGBitmapContextCreateImage(context);
-    CGContextRelease(context);
-
-    UIImage *decompressedImage = [[UIImage alloc] initWithCGImage:decompressedImageRef scale:image.scale orientation:image.imageOrientation];
-    CGImageRelease(decompressedImageRef);
-    return SDWIReturnAutoreleased(decompressedImage);
+    UIGraphicsBeginImageContextWithOptions(image.size, !imageHasAlphaInfo, 0);
+    CGRect rect = (CGRect){.origin = CGPointZero, .size = image.size};
+    [image drawInRect:rect];
+    UIImage *decompressedImage = UIGraphicsGetImageFromCurrentImageContext();
+    UIGraphicsEndImageContext();
+
+    return decompressedImage;
 }
 
 @end

SDWebImage/SDWebImageDownloader.m

@@ -76,7 +76,7 @@ + (void)setMaxConcurrentDownloads:(NSUInteger)max
 - (void)start
 {
     // In order to prevent from potential duplicate caching (NSURLCache + SDImageCache) we disable the cache for image requests
-    NSURLRequest *request = [[NSURLRequest alloc] initWithURL:url cachePolicy:NSURLRequestReloadIgnoringLocalCacheData timeoutInterval:15];
+    NSURLRequest *request = [[NSURLRequest alloc] initWithURL:url cachePolicy:NSURLCacheStorageNotAllowed timeoutInterval:15];
     self.connection = SDWIReturnAutoreleased([[NSURLConnection alloc] initWithRequest:request delegate:self startImmediately:NO]);
 
     // If not in low priority mode, ensure we aren't blocked by UI manipulations (default runloop mode for NSURLConnection is NSEventTrackingRunLoopMode)
@@ -253,6 +253,12 @@ - (void)connection:(NSURLConnection *)connection didFailWithError:(NSError *)err
     self.imageData = nil;
 }
 
+//prevent caching of responses in Cache.db
+- (NSCachedURLResponse *)connection:(NSURLConnection *)connection willCacheResponse:(NSCachedURLResponse *)cachedResponse
+{
+    return nil;
+}
+
 #pragma mark SDWebImageDecoderDelegate
 
 - (void)imageDecoder:(SDWebImageDecoder *)decoder didFinishDecodingImage:(UIImage *)image userInfo:(NSDictionary *)aUserInfo