Browse files

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

…into cbowns-rebasedMaster
  • Loading branch information...
2 parents fc24642 + 0237551 commit b52f85b31f0139a58cfd2f9823ca31e408604642 @rs committed May 12, 2012
Showing with 5 additions and 5 deletions.
  1. +1 −1 README.md
  2. +1 −1 SDWebImage/SDWebImageDecoder.h
  3. +1 −1 SDWebImage/SDWebImageDecoder.m
  4. +2 −2 SDWebImage/SDWebImagePrefetcher.m
View
2 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
View
2 SDWebImage/SDWebImageDecoder.h
@@ -64,4 +64,4 @@
+ (UIImage *)decodedImageWithImage:(UIImage *)image;
-@end
+@end
View
2 SDWebImage/SDWebImageDecoder.m
@@ -111,7 +111,7 @@ + (UIImage *)decodedImageWithImage:(UIImage *)image
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);
View
4 SDWebImage/SDWebImagePrefetcher.m
@@ -51,9 +51,9 @@ - (void)prefetchURLs:(NSArray *)urls
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];
}

0 comments on commit b52f85b

Please sign in to comment.