Rename SDWebImageAvoidAutoImageFill option to SDWebImageAvoidAutoSetImage

Jean-Charles SORIN · Jean-Charles SORIN · commit 4d6693c81339 · 2015-07-01T10:11:35.000+02:00
diff --git a/SDWebImage/SDWebImageManager.h b/SDWebImage/SDWebImageManager.h
@@ -88,7 +88,7 @@ typedef NS_OPTIONS(NSUInteger, SDWebImageOptions) {
      * 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
+    SDWebImageAvoidAutoSetImage = 1 << 11
 };
 
 typedef void(^SDWebImageCompletionBlock)(UIImage *image, NSError *error, SDImageCacheType cacheType, NSURL *imageURL);
diff --git a/SDWebImage/UIImageView+WebCache.m b/SDWebImage/UIImageView+WebCache.m
@@ -54,7 +54,7 @@ - (void)sd_setImageWithURL:(NSURL *)url placeholderImage:(UIImage *)placeholder
             if (!wself) return;
             dispatch_main_sync_safe(^{
                 if (!wself) return;
-                if (image && (options & SDWebImageAvoidAutoImageFill) && completedBlock)
+                if (image && (options & SDWebImageAvoidAutoSetImage) && completedBlock)
                 {
                     completedBlock(image, error, cacheType, url);
                     return;

Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ - (void)sd_setImageWithURL:(NSURL )url placeholderImage:(UIImage )placeholder`
`54`	`54`	`if (!wself) return;`
`55`	`55`	`dispatch_main_sync_safe(^{`
`56`	`56`	`if (!wself) return;`
`57`		`- if (image && (options & SDWebImageAvoidAutoImageFill) && completedBlock)`
	`57`	`+ if (image && (options & SDWebImageAvoidAutoSetImage) && completedBlock)`
`58`	`58`	`{`
`59`	`59`	`completedBlock(image, error, cacheType, url);`
`60`	`60`	`return;`