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

Ensure we always set the UIKit image properties from the main thread (fix #403, fix #417, fix #398)

This commit is contained in:
Olivier Poitrey 2013-06-12 17:01:01 +02:00
parent 9a1f072e5e
commit c6664248f1
3 changed files with 73 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
SDWebImage/MKAnnotationView+WebCache.m
View File

@ -49,15 +49,27 @@ static char operationKey;
__weak MKAnnotationView *wself = self; __weak MKAnnotationView *wself = self;
id<SDWebImageOperation> operation = [SDWebImageManager.sharedManager downloadWithURL:url options:options progress:nil completed:^(UIImage *image, NSError *error, SDImageCacheType cacheType, BOOL finished) id<SDWebImageOperation> operation = [SDWebImageManager.sharedManager downloadWithURL:url options:options progress:nil completed:^(UIImage *image, NSError *error, SDImageCacheType cacheType, BOOL finished)
{ {
__strong MKAnnotationView *sself = wself; if (!wself) return;
if (!sself) return; void (^block)(void) = ^
if (image)
{ {
sself.image = image; __strong MKAnnotationView *sself = wself;
if (!sself) return;
if (image)
{
sself.image = image;
}
if (completedBlock && finished)
{
completedBlock(image, error, cacheType);
}
};
if ([NSThread isMainThread])
{
block();
} }
if (completedBlock && finished) else
{ {
completedBlock(image, error, cacheType); dispatch_sync(dispatch_get_main_queue(), block);
} }
}]; }];
objc_setAssociatedObject(self, &operationKey, operation, OBJC_ASSOCIATION_RETAIN_NONATOMIC); objc_setAssociatedObject(self, &operationKey, operation, OBJC_ASSOCIATION_RETAIN_NONATOMIC);

48
SDWebImage/UIButton+WebCache.m
View File

@ -48,15 +48,27 @@ static char operationKey;
__weak UIButton *wself = self; __weak UIButton *wself = self;
id<SDWebImageOperation> operation = [SDWebImageManager.sharedManager downloadWithURL:url options:options progress:nil completed:^(UIImage *image, NSError *error, SDImageCacheType cacheType, BOOL finished) id<SDWebImageOperation> operation = [SDWebImageManager.sharedManager downloadWithURL:url options:options progress:nil completed:^(UIImage *image, NSError *error, SDImageCacheType cacheType, BOOL finished)
{ {
__strong UIButton *sself = wself; if (!wself) return;
if (!sself) return; void (^block)(void) = ^
if (image)
{ {
[sself setImage:image forState:state]; __strong UIButton *sself = wself;
if (!sself) return;
if (image)
{
[sself setImage:image forState:state];
}
if (completedBlock && finished)
{
completedBlock(image, error, cacheType);
}
};
if ([NSThread isMainThread])
{
block();
} }
if (completedBlock && finished) else
{ {
completedBlock(image, error, cacheType); dispatch_sync(dispatch_get_main_queue(), block);
} }
}]; }];
objc_setAssociatedObject(self, &operationKey, operation, OBJC_ASSOCIATION_RETAIN_NONATOMIC); objc_setAssociatedObject(self, &operationKey, operation, OBJC_ASSOCIATION_RETAIN_NONATOMIC);
@ -99,15 +111,27 @@ static char operationKey;
__weak UIButton *wself = self; __weak UIButton *wself = self;
id<SDWebImageOperation> operation = [SDWebImageManager.sharedManager downloadWithURL:url options:options progress:nil completed:^(UIImage *image, NSError *error, SDImageCacheType cacheType, BOOL finished) id<SDWebImageOperation> operation = [SDWebImageManager.sharedManager downloadWithURL:url options:options progress:nil completed:^(UIImage *image, NSError *error, SDImageCacheType cacheType, BOOL finished)
{ {
__strong UIButton *sself = wself; if (!wself) return;
if (!sself) return; void (^block)(void) = ^
if (image)
{ {
[sself setBackgroundImage:image forState:state]; __strong UIButton *sself = wself;
if (!sself) return;
if (image)
{
[sself setBackgroundImage:image forState:state];
}
if (completedBlock && finished)
{
completedBlock(image, error, cacheType);
}
};
if ([NSThread isMainThread])
{
block();
} }
if (completedBlock && finished) else
{ {
completedBlock(image, error, cacheType); dispatch_sync(dispatch_get_main_queue(), block);
} }
}]; }];
objc_setAssociatedObject(self, &operationKey, operation, OBJC_ASSOCIATION_RETAIN_NONATOMIC); objc_setAssociatedObject(self, &operationKey, operation, OBJC_ASSOCIATION_RETAIN_NONATOMIC);

26
SDWebImage/UIImageView+WebCache.m
View File

@ -54,16 +54,28 @@ static char operationKey;
__weak UIImageView *wself = self; __weak UIImageView *wself = self;
id<SDWebImageOperation> operation = [SDWebImageManager.sharedManager downloadWithURL:url options:options progress:progressBlock completed:^(UIImage *image, NSError *error, SDImageCacheType cacheType, BOOL finished) id<SDWebImageOperation> operation = [SDWebImageManager.sharedManager downloadWithURL:url options:options progress:progressBlock completed:^(UIImage *image, NSError *error, SDImageCacheType cacheType, BOOL finished)
{ {
__strong UIImageView *sself = wself; if (!wself) return;
if (!sself) return; void (^block)(void) = ^
if (image)
{ {
sself.image = image; __strong UIImageView *sself = wself;
[sself setNeedsLayout]; if (!sself) return;
if (image)
{
sself.image = image;
[sself setNeedsLayout];
}
if (completedBlock && finished)
{
completedBlock(image, error, cacheType);
}
};
if ([NSThread isMainThread])
{
block();
} }
if (completedBlock && finished) else
{ {
completedBlock(image, error, cacheType); dispatch_sync(dispatch_get_main_queue(), block);
} }
}]; }];
objc_setAssociatedObject(self, &operationKey, operation, OBJC_ASSOCIATION_RETAIN_NONATOMIC); objc_setAssociatedObject(self, &operationKey, operation, OBJC_ASSOCIATION_RETAIN_NONATOMIC);