mirrors
/
SDWebImage
mirror of https://github.com/SDWebImage/SDWebImage.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix crash condition + invalid image orientation (fix #206)

This commit is contained in:
Olivier Poitrey 2012-11-04 10:12:26 +01:00
parent 28f720ea32
commit 57f0700618
4 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
SDWebImage/MKAnnotationView+WebCache.m
View File

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

2
SDWebImage/SDWebImageCompat.h
View File

@ -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) SDWISafeRelease(image)
image = scaledImage; image = scaledImage;
} }

5
SDWebImage/UIButton+WebCache.m
View File

@ -129,7 +129,10 @@
- (void)cancelCurrentImageLoad - (void)cancelCurrentImageLoad
{ {
[[SDWebImageManager sharedManager] cancelForDelegate:self]; @synchronized(self)
{
[[SDWebImageManager sharedManager] cancelForDelegate:self];
}
} }
- (void)webImageManager:(SDWebImageManager *)imageManager didProgressWithPartialImage:(UIImage *)image forURL:(NSURL *)url userInfo:(NSDictionary *)info - (void)webImageManager:(SDWebImageManager *)imageManager didProgressWithPartialImage:(UIImage *)image forURL:(NSURL *)url userInfo:(NSDictionary *)info

5
SDWebImage/UIImageView+WebCache.m
View File

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