Skip to content

Commit

Permalink
Add an option called "SDWebImageAvoidAutoImageFill" to avoid automati…
Browse files Browse the repository at this point in the history
…c image addition in UIImageView and let developer to do it himself
  • Loading branch information
Jean-Charles SORIN committed Jun 18, 2015
1 parent 48d10c1 commit 5d2963a
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 1 deletion.
7 changes: 7 additions & 0 deletions SDWebImage/SDWebImageManager.h
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,13 @@ typedef NS_OPTIONS(NSUInteger, SDWebImageOptions) {
* Use this flag to transform them anyway.
*/
SDWebImageTransformAnimatedImage = 1 << 10,

/**
* By default, image is added to the imageView after download. But in some cases, we want to
* have the hand before setting the image (apply a filter or add it with cross-fade animation for instance)
* Use this flag if you want to manually set the image in the completion when success
*/
SDWebImageAvoidAutoImageFill = 1 << 11
};

typedef void(^SDWebImageCompletionBlock)(UIImage *image, NSError *error, SDImageCacheType cacheType, NSURL *imageURL);
Expand Down
7 changes: 6 additions & 1 deletion SDWebImage/UIImageView+WebCache.m
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,12 @@ - (void)sd_setImageWithURL:(NSURL *)url placeholderImage:(UIImage *)placeholder
if (!wself) return;
dispatch_main_sync_safe(^{
if (!wself) return;
if (image) {
if (image && (options & SDWebImageAvoidAutoImageFill) && completedBlock)
{
completedBlock(image, error, cacheType, url);
return;
}
else if (image) {
wself.image = image;
[wself setNeedsLayout];
} else {
Expand Down

0 comments on commit 5d2963a

Please sign in to comment.