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

Merge pull request #1011 from mattjgalloway/error_domain 

Make a constant for the error domain
This commit is contained in:
Bogdan Poplauschi 2015-03-19 10:55:59 +02:00
parent 27e3038ec3 761b00553b
commit 0ef0e07f77
7 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
SDWebImage/MKAnnotationView+WebCache.m
View File

@ -62,7 +62,7 @@ static char imageURLKey;
[self sd_setImageLoadOperation:operation forKey:@"MKAnnotationViewImage"]; [self sd_setImageLoadOperation:operation forKey:@"MKAnnotationViewImage"];
} else { } else {
dispatch_main_async_safe(^{ dispatch_main_async_safe(^{
NSError *error = [NSError errorWithDomain:@"SDWebImageErrorDomain" code:-1 userInfo:@{NSLocalizedDescriptionKey : @"Trying to load a nil url"}]; NSError *error = [NSError errorWithDomain:SDWebImageErrorDomain code:-1 userInfo:@{NSLocalizedDescriptionKey : @"Trying to load a nil url"}];
if (completedBlock) { if (completedBlock) {
completedBlock(nil, error, SDImageCacheTypeNone, url); completedBlock(nil, error, SDImageCacheTypeNone, url);
} }

2
SDWebImage/SDWebImageCompat.h
View File

@ -55,6 +55,8 @@ extern UIImage *SDScaledImageForKey(NSString *key, UIImage *image);
typedef void(^SDWebImageNoParamsBlock)(); typedef void(^SDWebImageNoParamsBlock)();
extern NSString *const SDWebImageErrorDomain;
#define dispatch_main_sync_safe(block)\ #define dispatch_main_sync_safe(block)\
if ([NSThread isMainThread]) {\ if ([NSThread isMainThread]) {\
block();\ block();\

2
SDWebImage/SDWebImageCompat.m
View File

@ -43,3 +43,5 @@ inline UIImage *SDScaledImageForKey(NSString *key, UIImage *image) {
return image; return image;
} }
} }
NSString *const SDWebImageErrorDomain = @"SDWebImageErrorDomain";

2
SDWebImage/SDWebImageDownloaderOperation.m
View File

@ -376,7 +376,7 @@
} }
} }
if (CGSizeEqualToSize(image.size, CGSizeZero)) { if (CGSizeEqualToSize(image.size, CGSizeZero)) {
completionBlock(nil, nil, [NSError errorWithDomain:@"SDWebImageErrorDomain" code:0 userInfo:@{NSLocalizedDescriptionKey : @"Downloaded image has 0 pixels"}], YES); completionBlock(nil, nil, [NSError errorWithDomain:SDWebImageErrorDomain code:0 userInfo:@{NSLocalizedDescriptionKey : @"Downloaded image has 0 pixels"}], YES);
} }
else { else {
completionBlock(image, self.imageData, nil, YES); completionBlock(image, self.imageData, nil, YES);

4
SDWebImage/UIButton+WebCache.m
View File

@ -57,7 +57,7 @@ static char imageURLStorageKey;
[self.imageURLStorage removeObjectForKey:@(state)]; [self.imageURLStorage removeObjectForKey:@(state)];
dispatch_main_async_safe(^{ dispatch_main_async_safe(^{
NSError *error = [NSError errorWithDomain:@"SDWebImageErrorDomain" code:-1 userInfo:@{NSLocalizedDescriptionKey : @"Trying to load a nil url"}]; NSError *error = [NSError errorWithDomain:SDWebImageErrorDomain code:-1 userInfo:@{NSLocalizedDescriptionKey : @"Trying to load a nil url"}];
if (completedBlock) { if (completedBlock) {
completedBlock(nil, error, SDImageCacheTypeNone, url); completedBlock(nil, error, SDImageCacheTypeNone, url);
} }
@ -128,7 +128,7 @@ static char imageURLStorageKey;
[self sd_setBackgroundImageLoadOperation:operation forState:state]; [self sd_setBackgroundImageLoadOperation:operation forState:state];
} else { } else {
dispatch_main_async_safe(^{ dispatch_main_async_safe(^{
NSError *error = [NSError errorWithDomain:@"SDWebImageErrorDomain" code:-1 userInfo:@{NSLocalizedDescriptionKey : @"Trying to load a nil url"}]; NSError *error = [NSError errorWithDomain:SDWebImageErrorDomain code:-1 userInfo:@{NSLocalizedDescriptionKey : @"Trying to load a nil url"}];
if (completedBlock) { if (completedBlock) {
completedBlock(nil, error, SDImageCacheTypeNone, url); completedBlock(nil, error, SDImageCacheTypeNone, url);
} }

2
SDWebImage/UIImageView+HighlightedWebCache.m
View File

@ -51,7 +51,7 @@
[self sd_setImageLoadOperation:operation forKey:UIImageViewHighlightedWebCacheOperationKey]; [self sd_setImageLoadOperation:operation forKey:UIImageViewHighlightedWebCacheOperationKey];
} else { } else {
dispatch_main_async_safe(^{ dispatch_main_async_safe(^{
NSError *error = [NSError errorWithDomain:@"SDWebImageErrorDomain" code:-1 userInfo:@{NSLocalizedDescriptionKey : @"Trying to load a nil url"}]; NSError *error = [NSError errorWithDomain:SDWebImageErrorDomain code:-1 userInfo:@{NSLocalizedDescriptionKey : @"Trying to load a nil url"}];
if (completedBlock) { if (completedBlock) {
completedBlock(nil, error, SDImageCacheTypeNone, url); completedBlock(nil, error, SDImageCacheTypeNone, url);
} }

2
SDWebImage/UIImageView+WebCache.m
View File

@ -71,7 +71,7 @@ static char imageURLKey;
[self sd_setImageLoadOperation:operation forKey:@"UIImageViewImageLoad"]; [self sd_setImageLoadOperation:operation forKey:@"UIImageViewImageLoad"];
} else { } else {
dispatch_main_async_safe(^{ dispatch_main_async_safe(^{
NSError *error = [NSError errorWithDomain:@"SDWebImageErrorDomain" code:-1 userInfo:@{NSLocalizedDescriptionKey : @"Trying to load a nil url"}]; NSError *error = [NSError errorWithDomain:SDWebImageErrorDomain code:-1 userInfo:@{NSLocalizedDescriptionKey : @"Trying to load a nil url"}];
if (completedBlock) { if (completedBlock) {
completedBlock(nil, error, SDImageCacheTypeNone, url); completedBlock(nil, error, SDImageCacheTypeNone, url);
} }