DreamPiggy
d90ca19d1b
Revert the changes due to merge conflict.
2019-01-26 17:42:17 +08:00
DreamPiggy
4bb93d293f
Merge branch 'master' of https://github.com/SDWebImage/SDWebImage into 5.x
...
# Conflicts:
# CHANGELOG.md
# SDWebImage.podspec
# SDWebImage/FLAnimatedImage/FLAnimatedImageView+WebCache.m
# SDWebImage/SDWebImageDownloader.m
# SDWebImage/SDWebImageDownloaderOperation.m
# SDWebImage/SDWebImageWebPCoder.m
# SDWebImage/UIView+WebCache.h
# SDWebImage/UIView+WebCache.m
# Tests/Tests/SDCategoriesTests.m
# WebImage/Info.plist
2019-01-26 17:02:27 +08:00
DreamPiggy
c09bd8b42a
Merge pull request #2588 from dreampiggy/bugfix_fl_placeholder_another_taste
...
Fix the FLAnimatedImage compatible code issue by introduce a private API
2019-01-26 16:19:49 +08:00
Kinarobin
35763e3376
Merge pull request #2558 from dreampiggy/bugfix_memory_cost_animating
...
Fix the current image cost (pixels) for FLAnimatedImage
2019-01-25 18:56:05 +08:00
DreamPiggy
2493071987
Merge pull request #2575 from zhongwuzw/prioritize_operation
...
Prioritize SDWebImageDownloaderHighPriority if operation already exists
2019-01-25 12:00:08 +08:00
DreamPiggy
ca1d692efe
Merge pull request #2576 from zhongwuzw/fix-notification-retain-self
...
Retain operation when post download related notifications
2019-01-25 11:22:29 +08:00
DreamPiggy
7bfc950b98
Merge branch 'master' of https://github.com/rs/SDWebImage into bugfix_webp_force_decode
...
# Conflicts:
# SDWebImage/SDWebImageWebPCoder.m
2019-01-24 15:24:34 +08:00
zhongwuzw
c3b0f64017
update
2019-01-22 16:04:12 +08:00
zhongwuzw
5b1ad45889
Revert the colorSpace naming
2019-01-22 12:54:57 +08:00
DreamPiggy
f9fe2bb7b6
Fix the hardcode to filter WebP for force decoding
2019-01-21 21:21:49 +08:00
DreamPiggy
c804ba7ea8
Fix that WebP decoder in master branch, does not consider the global `shouldDecompressImages` config and always do pre-draw for static WebP images.
2019-01-21 21:21:49 +08:00
zhongwuzw
4c006ad573
Adjust indention, seems come from buggy Xcode
2019-01-19 20:46:05 +08:00
zhongwuzw
fac703140c
Fix potential memory leaks for ICCP && optimize ICCP handler
2019-01-19 17:59:59 +08:00
DreamPiggy
605caa409d
Fix the FLAnimatedImage compatible code issue by introduce a private API to check for the special cases
2019-01-14 13:07:45 +08:00
zhongwuzw
3a470fc8b0
Using __block instead
2019-01-11 15:11:01 +08:00
DreamPiggy
73b7a26ccc
Fix that WebP image with ICC Profile does not show color correctly, should use the profile colorspace instead of device colorspace
2019-01-11 14:17:08 +08:00
zhongwuzw
e71e58ea6d
Revert failed block processing logic
2019-01-09 22:03:06 +08:00
DreamPiggy
a1106d51f0
Move the block failed url logic into a separate method, filter the error codes not inside NSURLErrorDomain
2019-01-08 14:05:05 +08:00
DreamPiggy
cf1d993b97
Move the cache storage logic after download, into a single function to enhance the readability
2019-01-08 13:50:52 +08:00
zhongwuzw
ccf5541a7d
Fix memory cost override for SDAnimatedImage
2019-01-07 22:59:46 +08:00
zhongwuzw
c547adc2a9
Retain operation when post download related notifications
2019-01-07 17:05:03 +08:00
zhongwuzw
8a743950e2
Prioritize SDWebImageDownloaderHighPriority if operation already exists
2019-01-07 16:24:41 +08:00
zhongwuzw
6becff0f06
Fix race condition for creation of download operation when isCancelled is YES but isFinished is NO
...
Fix race condition for creation of download operation when isCancelled is YES but isFinished is NO
update comment
2019-01-07 16:05:53 +08:00
DreamPiggy
6dd92d11ff
Use the memory bytes size, instead of pixel size to calculate the memory cost function
2019-01-03 15:59:22 +08:00
DreamPiggy
b866c6aa97
Merge branch 'master' of https://github.com/SDWebImage/SDWebImage into 5.x
...
# Conflicts:
# CHANGELOG.md
# SDWebImage.podspec
# SDWebImage.xcodeproj/project.pbxproj
# SDWebImage/FLAnimatedImage/FLAnimatedImageView+WebCache.m
# SDWebImage/SDImageCache.m
# SDWebImage/SDWebImageDownloaderOperation.m
# SDWebImage/UIView+WebCache.m
# Tests/SDWebImage Tests.xcodeproj/project.pbxproj
2019-01-03 14:54:37 +08:00
DreamPiggy
3b19e76c6f
Update the code for UIAnimatedImage associated with FLAnimatedImage case...This can happen when enable `GIF coder` as well as using FLAnimatedImageView
2019-01-03 14:21:18 +08:00
DreamPiggy
c381506932
Fix the current image cost (pixels) for FLAnimatedImage, with a more correct value for memory cost function
2019-01-03 14:15:27 +08:00
DreamPiggy
c95be0994e
Update the category's naming for memory cache cost, a little code enhancement to avoid NSNumber generation
2019-01-03 12:08:18 +08:00
DreamPiggy
e6a4e74ed5
Revert the changes for unused public API, polish comments
2019-01-03 11:49:06 +08:00
DreamPiggy
1700f9726d
Merge pull request #2486 from zhongwuzw/fix-cache-cost-miscalculation-for-master
...
Fix memory cache image cost miscalculation for animated images. Introduce the customized cost function for advacend feature.
2019-01-03 11:41:41 +08:00
zhongwuzw
9725c8da72
Remove edge case check
2018-12-28 11:14:19 +08:00
zhongwuzw
181d367215
Fix background download operation
...
FIx background download
Add task check when operation will deallocated && tidy code
2018-12-28 11:14:13 +08:00
zhongwuzw
c58642976f
put FLAnimatedImage fix into another PR
2018-12-27 21:30:07 +08:00
DreamPiggy
38a9222401
Merge pull request #2500 from zhongwuzw/fix-background-download
...
Fix background download
2018-12-27 14:42:35 +08:00
zhongwuzw
de74bdca80
Remove edge case check
2018-12-26 20:29:09 +08:00
zhongwuzw
9617a34408
Fix background download operation
...
FIx background download
Add task check when operation will deallocated && tidy code
Tidy code further
Tidy further
2018-12-26 10:25:39 +08:00
DreamPiggy
95dba7307d
Update the migration guide for cache path about 5.0.0-beta version
2018-12-10 13:28:06 +08:00
zhongwuzw
216ba9c7e1
Fix crash when NSMapTable empty keys
2018-12-10 10:41:17 +08:00
DreamPiggy
b68730bedf
Use the more intuitive and suitable cache path for SDImageCache. Defaults now to `~Library/Caches/com.hackemist.SDImageCache/default/`, namespace controls the sub-directory name.
...
Remove the namespacePrefix property because now it's not follows what it says
2018-12-09 15:23:26 +08:00
zhongwuzw
cff0f33430
Add update image memory cost method
2018-12-09 11:56:51 +08:00
zhongwuzw
45427b1eed
Merge branch 'remote-master' into fix-cache-cost-miscalculation-for-master
2018-12-09 10:45:38 +08:00
DreamPiggy
1b1cf603ed
Revert "Add image url check when set image"
2018-12-01 14:56:31 +08:00
langyanduan
f47d60a802
fix: FLAnimatedImage custom property
2018-11-29 11:10:51 +08:00
DreamPiggy
f663cab2c9
Merge branch 'master' of https://github.com/SDWebImage/SDWebImage into 5.x
...
# Conflicts:
# CHANGELOG.md
# README.md
# SDWebImage.podspec
# SDWebImage/FLAnimatedImage/FLAnimatedImageView+WebCache.m
# SDWebImage/SDImageCache.m
# SDWebImage/SDWebImageCompat.m
# SDWebImage/SDWebImageDownloaderOperation.m
# SDWebImage/SDWebImageManager.m
# SDWebImage/UIView+WebCache.h
# SDWebImage/UIView+WebCache.m
# Tests/Tests/SDImageCacheTests.m
# WebImage/Info.plist
2018-11-17 11:54:18 +08:00
zhongwuzw
9dacf99738
update
2018-11-15 21:32:05 +08:00
zhongwuzw
8c7764e122
Fix comments in code
2018-11-15 21:13:27 +08:00
zhongwuzw
c95c35d6db
Add image url check when set image
2018-11-15 13:55:32 +08:00
Bogdan Poplauschi
944c57eaa9
Merge pull request #2530 from zhongwuzw/fix_flanimatedImage_step_2
...
Fix FLAnimatedImageView reuse wrong image && remove GCD strong retained
2018-11-14 09:40:07 -06:00
zhongwuzw
7e7a332278
Fix FLAnimatedImageView reuse wrong image && remove GCD strong retained
2018-11-14 21:03:29 +08:00
zhongwuzw
5611863f6a
Fix wrong image cache type when disk and memory cache missed
2018-11-14 16:18:50 +08:00
DreamPiggy
772b79c824
Merge pull request #2494 from bpoplauschi/xcode_10
...
Xcode 10 + using xcconfig for project settings
2018-11-14 11:58:22 +08:00
Bogdan Poplauschi
0e77a30000
Merge pull request #2441 from dreampiggy/performance_FLAnimatedImage_compatible_code
...
Revert the hack code for FLAnimatedImage compatible, because of the FLAnimatedImage initializer method block main queue.
2018-11-12 04:44:47 +02:00
Bogdan Poplauschi
edb9c45859
Xcode 10 - upgraded schemes, using xcode10 Travis image, removed some deprecated methods from our demos + formatting
...
Using xcconfig files - easier to maintain all the settings appart from target files, less conflicts, can reuse the values
2018-11-11 20:19:33 -06:00
zhongwuzw
62ce1d3b5e
Fix macos build failed
2018-11-11 22:16:03 +08:00
zhongwuzw
3fbb7856e5
Transform protocol to category
2018-11-11 21:39:12 +08:00
DreamPiggy
5d097bbc8d
Fix the `SDGraphicsBeginImageContext` method recursive call issue
2018-11-01 11:18:14 +08:00
DreamPiggy
025c5f833b
Expose the all image graphics methods to public method, make it easy for coder plugin user to reuse it instead of duplicate code
2018-10-31 15:25:52 +08:00
DreamPiggy
ee6f99f204
Fix that the graphics helper method will return nil when scale = 0, match the UIKit behavior
2018-10-31 14:40:10 +08:00
Noah
2ac9b2fc6a
Update SDWebImage/SDWebImageCompat.m
2018-10-30 15:00:25 +08:00
Noah
042c27ec8c
Optimize when scale = 1
2018-10-30 01:26:44 +08:00
DreamPiggy
67499263a8
Fix the accident changes of Swift API naming for `sd_imageDataAsFormat:`. We should keep previous naming `sd_imageData(as:)`
2018-10-29 12:52:17 +08:00
zhongwuzw
41214cccae
Fix extention long length of file name
2018-10-28 17:59:52 +08:00
zhongwuzw
9d7b82f1fb
Replace atomic property with SD_LOCK
...
Replace atomic property with SD_LOCK
fix LOCK not decrease
2018-10-27 21:11:40 +08:00
zhongwuzw
8d3becfae8
Update url after framework transferred
2018-10-24 17:34:55 +08:00
DreamPiggy
1ec61ad567
Renaming the `LOCK`, `UNLOCK` with SD prefix to avoid overriding user-defined macro. Remove `LOCKBLOCK` with paired macro instead to make it easy to debug
2018-09-18 23:17:43 +08:00
zhongwuzw
504dc10491
Take images into account
2018-09-13 10:48:52 +08:00
zhongwuzw
991fd89985
Fix memory cache image cost miscalculation for 4.x
2018-09-12 23:04:45 +08:00
Bogdan Poplauschi
bb7adaca37
Merge pull request #2474 from zhongwuzw/add_autorelease_to_gcd_block
...
Add autoreleasepool to release autorelease objects in advance when using GCD
2018-09-08 19:41:48 +03:00
zhongwuzw
733f465e5c
Add autoreleasepool to release autorelease objects in advance when using GCD for 4.x
2018-09-07 22:44:21 +08:00
Bogdan Poplauschi
64123734c3
Move webp component (and libwebp dependency) to SDWebImage/SDWebImageWebPCoder
...
- move the webp component + the libwebp dependency to SDWebImage/SDWebImageWebPCoder (including tests and demo)
- Xcode 9.4
- instead of directly linking the Demos to the frameworks, using CocoaPods (`Examples/Podfile`). This allows using SDWebImage/SDWebImageWebPCoder into our examples so we keep the WebP demos
- demos code cleanup and warnings resolved
- all links from docs (README, Migration guide, CHANGELOG) are full links, so they work even from external pages (i.e. https://cocoapods.org/pods/SDWebImage ).
- added "Additional modules" section to README
2018-09-07 12:40:25 +03:00
zhongwuzw
703631d51a
Add autoreleasepool to release autorelease objects in advance when using GCD
2018-09-07 10:48:38 +08:00
zhongwuzw
b1b48cca81
Remove kCGImageSourceShouldCache option when create image source
2018-09-05 22:07:34 +08:00
zhongwuzw
3dc5b0ab67
Change data compare statement when do animated data comparation
2018-09-03 16:34:17 +08:00
zhongwuzw
759b7322c9
Remove lock tradeoff when get fetchFrame
2018-08-31 21:53:53 +08:00
zhongwuzw
6d85cd9061
Decrease animated decode times when cache enable
2018-08-31 17:47:39 +08:00
DreamPiggy
c76b9e3c2a
Add protect when custom animated image class image data is nil during progressive animation check
2018-08-30 23:25:32 +08:00
Bogdan Poplauschi
2bb336bc12
Merge pull request #2449 from dreampiggy/feature_set_image_block_extra_args
...
Feature set image block extra args
2018-08-28 12:36:55 +03:00
Bogdan Poplauschi
6892f9e818
Merge pull request #2453 from dreampiggy/improvement_animation_class_protocol
...
Add one initializer with extra arg for custom animated image class to use possible coder options, to make it extensible
2018-08-28 12:03:06 +03:00
Bogdan Poplauschi
03ab0a937f
Merge pull request #2459 from dreampiggy/remove_sd_setAnimationImagesWithURLs
...
Remove `sd_setAnimationImagesWithURLs` API, because its cause ambiguity, behave not consistently and have rare use case.
2018-08-28 11:59:38 +03:00
DreamPiggy
7c5c114aa5
Update the comment about scale factor for coders
2018-08-28 15:21:59 +08:00
DreamPiggy
c99ddbfac9
Add one initializer with extra arg for custom animated image class to use possible coder options, to make it extensible
2018-08-28 15:09:32 +08:00
DreamPiggy
8b21041fa8
Merge pull request #2461 from zhongwuzw/add-no-expire-file-of-disk
...
Add no expiration file support of disk cache
2018-08-28 14:28:37 +08:00
zhongwuzw
9bd5c05113
Add more detaild comments of maxCacheAge and fix typo
2018-08-28 11:29:19 +08:00
zhongwuzw
ce27aacd7b
Fix resource key invalid when clean cached disk file
2018-08-24 17:51:30 +08:00
zhongwuzw
1f3d83784c
Fix resource key invalid when clean cached disk file
2018-08-24 16:03:50 +08:00
zhongwuzw
9afbc8bf7e
Add no expiration file support of disk cache
2018-08-24 15:54:04 +08:00
DreamPiggy
349bec4497
Remove `sd_setAnimationImagesWithURLs` API, because its cause ambiguity, behave not consistently and have rare use case.
2018-08-23 15:35:38 +08:00
DreamPiggy
14391eb45e
Ignore to query disk cache when the image for FLAnimatedImageView+WebCache is placeholder
2018-08-21 14:09:02 +08:00
DreamPiggy
8c5db9484b
Adopt all the protocol APIs which contains getter value to use property instead, to make the API easy to use or Swift user
2018-08-19 12:10:26 +08:00
DreamPiggy
b400b51cca
Fix the bug that `SDWebImageContextCacheKeyFilter` wrongly be used as cache serializer and cause crash
2018-08-17 17:20:17 +08:00
DreamPiggy
a794088bc7
Revert the hack code for FLAnimatedImage compatible, because of the FLAnimatedImage initializer method block main queue.
2018-08-16 22:51:57 +08:00
DreamPiggy
a6a8308c15
Change the View Category setImageBlock with all args like View Transition or CompletedBlock, to make it useful for advanced usage
2018-08-16 11:32:12 +08:00
Bogdan Poplauschi
5ea8074bad
Merge pull request #2399 from zhongwuzw/replace-valueforkey
...
Replace valueForKey with objectForKey when access NSDictionary
2018-08-10 18:19:59 +03:00
zhongwuzw
30d077b0a6
Make callbacks of download more readable
2018-08-10 22:53:13 +08:00
DreamPiggy
1d8454d356
Fix that the minimumProgressInterval should always callback the final finished progress but not ignore it
2018-08-10 22:41:22 +08:00
Bogdan Poplauschi
64a2453527
Merge pull request #2437 from dreampiggy/bugfix_view_progress_indicator
...
Fix the bug that progress indicator on macOS stop at 1% but not 100% when download finished
2018-08-10 17:35:07 +03:00
Bogdan Poplauschi
13207dd986
Merge pull request #2435 from dreampiggy/bugfix_progressive_race_condition
...
Fix a race condition during progressive animation load in SDAnimatedImageView
2018-08-10 17:25:43 +03:00
DreamPiggy
41b0a0421e
Fix the mistake cause a bug that progress indicator on macOS stop at 1% but not 100% when download finished...
2018-08-10 22:05:35 +08:00
DreamPiggy
bbee2976af
Merge pull request #2433 from zhongwuzw/fix-cache-migration
...
Fix cache migration when dstPath intermediate directories not exist
2018-08-10 15:49:11 +08:00
DreamPiggy
3cd71e09ce
Merge branch 'master' of https://github.com/rs/SDWebImage into 5.x
...
# Conflicts:
# SDWebImage/NSData+ImageContentType.h
# SDWebImage/SDWebImageDownloader.m
# SDWebImage/SDWebImageImageIOCoder.m
2018-08-10 15:20:55 +08:00
DreamPiggy
6e79ef51f0
Fix a race condition during progressive animation load in SDAnimatedImageView.
...
When the coder was updated, currentData may not be the same instance as previousdData. We should check the that current data is appended by previous data
2018-08-10 13:19:27 +08:00
zhongwuzw
3a22bcff58
Fix cache migration when dstPath intermediate directories not exist
2018-08-10 09:00:34 +08:00
Bogdan Poplauschi
802e19b23d
Merge pull request #2426 from zhongwuzw/remove-notification-dispatch
...
Make download receive response notification only dispatch to specific observer
2018-08-09 17:41:58 +03:00
zhongwuzw
9a63520115
Remove NS_DESIGNATED_INITIALIZER macro
2018-08-09 20:43:35 +08:00
zhongwuzw
22a8c43bca
Put download token init internal
2018-08-09 17:21:24 +08:00
zhongwuzw
65f72743cc
Merge branch '5.x' into replace-valueforkey
2018-08-09 15:41:29 +08:00
zhongwuzw
ab5b5677b2
Remove setter of downloadOperation
2018-08-09 14:59:04 +08:00
Bogdan Poplauschi
83b5d22a56
Merge pull request #2417 from dreampiggy/feature_disk_cache_migration_from_4.x
...
Feature disk cache migration from 4.x
2018-08-08 12:47:20 +03:00
Bogdan Poplauschi
205e376388
Merge pull request #2409 from zhongwuzw/add-default-user-agent
...
Add default HTTP User-Agent for specific system
2018-08-08 12:42:07 +03:00
zhongwuzw
8cfda3dce9
Make download receive response notification only dispatch to specific observer
2018-08-08 15:36:57 +08:00
DreamPiggy
7ddb75710c
Add SDImageFormatHEIF represent mif1 && msf1 brands
...
Fix the current hard-coded system version checking with Image/IO source uttypes checking
2018-08-06 17:53:24 +08:00
zhongwuzw
36cd96acce
Add user-agent for tv-os
2018-08-06 14:38:35 +08:00
DreamPiggy
42caecf27b
Fix that `shouldUseWeakMemoryCache` code was lost during merge conflict
2018-08-06 11:18:00 +08:00
Bogdan Poplauschi
1d4823eb48
Merge pull request #2415 from dreampiggy/feature_minimum_progress_interval
...
Feature minimum progress interval
2018-08-04 19:11:04 +03:00
DreamPiggy
3863264a13
Improve the code robustness of disk cache migrate
2018-08-03 22:06:19 +08:00
DreamPiggy
d9d0b7d4bf
Add the feature, to migrate the disk cache from 4.x version to the new location of cache path.
2018-08-03 17:32:04 +08:00
DreamPiggy
8b7e88de50
Merge branch 'master' of https://github.com/rs/SDWebImage into 5.x
...
# Conflicts:
# SDWebImage/FLAnimatedImage/FLAnimatedImageView+WebCache.m
# SDWebImage/SDWebImageDownloader.h
# SDWebImage/SDWebImageDownloader.m
# SDWebImage/SDWebImageDownloaderOperation.h
# SDWebImage/UIView+WebCache.m
# Tests/Tests/SDWebImageDownloaderTests.m
2018-08-02 18:42:21 +08:00
Bogdan Poplauschi
676a4b53b7
Merge pull request #2336 from gukemanbu/xucg
...
remove addProgressCallback, add createDownloaderOperationWithUrl
2018-08-02 11:25:51 +03:00
DreamPiggy
67e0df75c6
Add one feature, to allow user to limit the progress interval and reduce the frequency of progress callback
...
Also fix that progressive decoding should stop when all image data is downloaded
2018-08-02 13:18:04 +08:00
DreamPiggy
892267af74
Fix that downloader options about image decoding is not correctly set
2018-08-02 11:07:53 +08:00
DreamPiggy
cb8879f56a
Fix that using `NS_TYPED_ENUM` on `SDImageFormat` cause the existing Swift API naming changed
2018-08-01 20:52:50 +08:00
zhongwuzw
c77310bb5d
Add default HTTP User-Agent for specific system
2018-07-31 16:29:39 +08:00
Bogdan Poplauschi
8f187477c6
Merge pull request #2406 from dreampiggy/fix_gif_rotation_after_exif_image
...
Fix the bug when FLAnimatedImageView firstly show one EXIF rotation JPEG `UIImage`, later animated GIF `FLAnimatedImage` will also be rotated
2018-07-29 21:39:46 +03:00
DreamPiggy
31896ff086
Fix the bug when FLAnimatedImageView firstly show one EXIF rotation JPEG `UIImage`, later animated GIF `FLAnimatedImage` will also be rotated
...
We help FLAnimatedImage framework to fix their issue :)
2018-07-27 22:24:31 +08:00
DreamPiggy
ef3123984f
Add SDImageCoderWebImageContext coder option, which allow custom coder plugin, to receive the context option from top-level API (Cache/Downloader/View Category)
2018-07-26 16:44:40 +08:00
DreamPiggy
919751f2de
Change SDImageFormat to use `NS_TYPED_EXTENSIBLE_ENUM` instead of fixed enum, to allow custom coder plugin extern the define ( #2400 )
...
* Change SDImageFormat to use `NS_TYPED_EXTENSIBLE_ENUM` instead of fixed enum, to allow custom coder plugin extern the define
* Update the comment and indent about `SDImageFormat`
2018-07-24 14:11:57 +08:00
zhongwuzw
2b7b5f5fa2
Use NSDictionary syntatic sugar
2018-07-24 13:05:12 +08:00
zhongwuzw
532a4d8229
Replace setValue:forKey with syntactic sugar
2018-07-24 10:09:57 +08:00
zhongwuzw
05889b6b9c
Replace valueForKey with objectForKey when access NSDictionary
2018-07-21 23:44:06 +08:00
zhongwuzw
16a1960018
Remove redundancy protocol declaration
2018-07-20 22:12:48 +08:00
zhongwuzw
43edf04ba0
Replace SDWebImageDownloaderOperation with NSOperation<SDWebImageDownloaderOperationInterface> to make generic
2018-07-20 22:08:06 +08:00
DreamPiggy
6398eedce8
Rename `sd_UTTypeFromSDImageFormat` to `sd_UTTypeFromImageFormat`
2018-07-19 01:44:48 +08:00
DreamPiggy
d5b60c6b39
Merge branch 'master' of https://github.com/rs/SDWebImage into 5.x
...
# Conflicts:
# CHANGELOG.md
# SDWebImage.podspec
# SDWebImage/FLAnimatedImage/FLAnimatedImageView+WebCache.m
# SDWebImage/SDImageCache.h
# SDWebImage/SDWebImageCoderHelper.m
# SDWebImage/SDWebImageCodersManager.m
# SDWebImage/SDWebImageCompat.m
# SDWebImage/SDWebImageGIFCoder.m
# SDWebImage/SDWebImageImageIOCoder.m
# SDWebImage/SDWebImageWebPCoder.m
# SDWebImage/UIImage+MultiFormat.h
# SDWebImage/UIImage+MultiFormat.m
# SDWebImage/UIView+WebCache.h
# SDWebImage/UIView+WebCache.m
# WebImage/Info.plist
2018-07-19 00:56:43 +08:00
Bogdan Poplauschi
d7c665068c
Merge pull request #2394 from zhongwuzw/fix-cfstringref-ownership-for-master
...
Replace __bridge_transfer with __bridge when convert from CFStringRef to NSString
2018-07-18 18:35:45 +03:00
zhongwuzw
61800a8e31
Replace __bridge_transfer with __bridge when convert from CFStringRef to NSString
2018-07-18 23:14:40 +08:00
zhongwuzw
593feb664c
Revert operation remove logic
2018-07-18 23:07:25 +08:00
zhongwuzw
7f1440bc96
Merge commit '98a2d9a3b4dd7ec47072e726a5d848b7a3bcc2f1' into fix-nullable
2018-07-18 23:03:13 +08:00
DreamPiggy
3863052094
Fix that FLAnimatedImageView+WebCache display behavior for GIF images and other images format
...
Fix FLAnimatedImageView will dispatch the completion block into next runloop even for non-GIF image
Fix FLAnimatedImageView may not show animation even when the disk image data is GIF image
2018-07-18 17:42:16 +08:00
zhongwuzw
b291351754
Replace __bridge_transfer with __bridge when convert from CFStringRef to NSString
2018-07-18 16:40:33 +08:00
Bogdan Poplauschi
f0f4b7d190
Merge pull request #2391 from dreampiggy/feature_disk_cache_data
...
Add one sync API for SDImageCache to directly get the image data from disk instead of image instance
2018-07-18 11:16:07 +03:00
DreamPiggy
5e52585944
Add one sync API for SDImageCache to directly get the image data from disk instead of image instance
2018-07-18 13:06:21 +08:00
DreamPiggy
bb41dbc046
Keep the information about image's original compressed format, for API which only contains image but not image data to process extra logic
2018-07-18 12:57:36 +08:00
zhongwuzw
820f13ec93
Fix nullable key when get image load operation
2018-07-17 17:51:23 +08:00
Bogdan Poplauschi
957de6d70f
Merge branch 'master' into 5.x
2018-07-17 11:10:12 +03:00
Bogdan Poplauschi
025af81bdf
Merge pull request #2385 from dreampiggy/project_move_FLAnimatedImage
...
Remove all FLAnimatedImage from the Core SDWebImage repo. Move the code to SDWebImageFLPlugin repo
2018-07-16 12:33:32 +03:00
zhongwuzw
9ec7aa4219
Fix nullable key when cancel image load operation
2018-07-13 22:43:00 +08:00
DreamPiggy
982ade8824
Remove all FLAnimatedImage from the Core SDWebImage repo. Move the code to SDWebImageFLPlugin repo
2018-07-13 22:17:02 +08:00
Bogdan Poplauschi
f8fe886334
Instead of defining `LOCK` and `UNLOCK` macros in each file, moved them to the `SDWebImageCompat.h`. Also, split into `LOCK` and `LOCKBLOCK`
2018-07-12 21:10:28 +03:00
zhongwuzw
d908a1cc35
Replace runningOperations of SDWebImageManager from Array to Set
2018-07-12 22:05:09 +08:00
DreamPiggy
0108475578
Merge branch 'master' of https://github.com/rs/SDWebImage into 5.x
...
# Conflicts:
# SDWebImage/SDImageCache.m
# SDWebImage/SDImageCacheConfig.h
# SDWebImage/SDImageCacheConfig.m
2018-07-12 19:33:18 +08:00