Merge branch 'rebasedMaster' of https://github.com/cbowns/SDWebImage into cbowns-rebasedMaster

README.md

@@ -220,7 +220,7 @@ time and do the right thing.
 Installation
 ------------
 
-You can chose to copy all the files in your project or to import the it as a static library.
+There are two ways to use this in your project: copy all the files into your project, or import the project as a static library.
 
 ### Add the SDWebImage project to your project
 

SDWebImage/SDWebImageDecoder.h

@@ -64,4 +64,4 @@
 
 + (UIImage *)decodedImageWithImage:(UIImage *)image;
 
-@end
+@end

SDWebImage/SDWebImageDecoder.m

@@ -111,7 +111,7 @@ static SDWebImageDecoder *sharedInstance;
     CGColorSpaceRelease(colorSpace);
     if (!context) return nil;
 
-    CGRect rect = (CGRect){CGPointZero, CGImageGetWidth(imageRef), CGImageGetHeight(imageRef)};
+    CGRect rect = (CGRect){CGPointZero,{CGImageGetWidth(imageRef), CGImageGetHeight(imageRef)}};
     CGContextDrawImage(context, rect, imageRef);
     CGImageRef decompressedImageRef = CGBitmapContextCreateImage(context);
     CGContextRelease(context);

SDWebImage/SDWebImagePrefetcher.m

@@ -51,9 +51,9 @@ static SDWebImagePrefetcher *instance;
     self.prefetchURLs = urls;
 
     // Starts prefetching from the very first image on the list with the max allowed concurrency
-    int listCount = [self.prefetchURLs count];
+    NSUInteger listCount = [self.prefetchURLs count];
     SDWebImageManager *manager = [SDWebImageManager sharedManager];
-    for (int i = 0; i < self.maxConcurrentDownloads && _requestedCount < listCount; i++)
+    for (NSUInteger i = 0; i < self.maxConcurrentDownloads && _requestedCount < listCount; i++)
     {
         [self startPrefetchingAtIndex:i withManager:manager];
     }