* 'master' of https://github.com/rs/SDWebImage:
Update the comments and a little enhancement for FLAnimatedImageView Category
Use a dispatch semaphore to keep thread safe for downloader because it need the hold cancel and add procedure be thread-safe
Add the current image/alternateImage url for NSButton category. A little code refactoring
Update macOS demo to add a clear cache button using NSButton category
Fix that reset alternateImage cancel the image load operation for NSButton+WebCache
Add WebCache category for NSButton on macOS
A little enhancement to avoid block capture the heap object
Use a internal method to avoid thread-safe issue for file manager. Remove that checkIOQueue and add sync version exist API
Add the image transition argument for all UIView+WebCache, make this easy for user to do some fade transition. It also reuse the current setImageBlock and make it easy to customize
# Conflicts:
# SDWebImage.xcodeproj/project.pbxproj
# SDWebImage/SDImageCache.h
# SDWebImage/SDImageCache.m
# SDWebImage/UIView+WebCache.h
# SDWebImage/UIView+WebCache.m
# WebImage/SDWebImage.h
* 'master' of https://github.com/rs/SDWebImage:
Add protect to some Core Graphics methods
Change all UIImage init method to alloc instead of autorelease to immediately release it after usage
Add a option SDWebImageFromCacheOnly to load the image from cache only and prevent network
Update the test for custom operation interface
Use synchronized instead of semaphore in SDWebImageDownloader to make it more easy to understand :)
Use a lock instead of barrier queue to avoid dispatch_sync blocking the main queue on race condition
* 'master' of https://github.com/rs/SDWebImage:
Remove the extra __block mark and the early weakOperation define
Add a convenience method to allow cancel on downloadToken
Use the weak-strong dancing and the weak reference to manager instance to avoid the leak of runningOperations
Use the associate object to store the FLAnimatedImage into memory cache, avoid blinking or UIView transaction. Tricky but may work
* 'master' of https://github.com/rs/SDWebImage:
Fix the getSize method which use the default file manager instead of current file manager
Deprecate the sd_setImageWithPreviousCachedImageWithURL with the specify options to achieve this usage
Use the @synchronized to access NSURLCache to fix the potential thread-safe problem, also fix that we always use shared cache but not follow session's configuration
* 'master' of https://github.com/rs/SDWebImage:
Update the test and description to make it more clear
Fix the issue that `setAnimationImagesWithURLs` weak reference may dealloc before the animated images was set
Fix the strange file permissions issue
Add the SDImageCacheQueryMemoryOnly to specify query memory only
Update the cache options name to make it more clear
Added missing param in storeImage examples
Add a NSProgress property represent the image loading progress, this allow user add KVO on it for complicated logic
DreamPiggy