ios / yh_sdwebimage · Commits

Go to a project

Authored by DreamPiggy
Commit 44e80816f0e9b8b6390b3c9bbf4d4f67eb0d26e3 1 parent 6e70dbc5

Fix SDWebImage v4 can not import libwebp framework's header files. 

Fix FLAnimatedImageView mixed local and global import
Inline Side-by-side
Showing 3 changed files with 9 additions and 3 deletions
@@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@
13 #if __has_include(<FLAnimatedImage/FLAnimatedImage.h>) 13 #if __has_include(<FLAnimatedImage/FLAnimatedImage.h>)
14 #import <FLAnimatedImage/FLAnimatedImage.h> 14 #import <FLAnimatedImage/FLAnimatedImage.h>
15 #else 15 #else
16 -#import "FLAnimatedImageView.h" 16 +#import "FLAnimatedImage.h"
17 #endif 17 #endif
18 18
19 #import "SDWebImageManager.h" 19 #import "SDWebImageManager.h"
@@ -13,7 +13,6 @@ @@ -13,7 +13,6 @@
13 #import "UIView+WebCacheOperation.h" 13 #import "UIView+WebCacheOperation.h"
14 #import "UIView+WebCache.h" 14 #import "UIView+WebCache.h"
15 #import "NSData+ImageContentType.h" 15 #import "NSData+ImageContentType.h"
16 -#import "FLAnimatedImage.h"  
17 #import "UIImageView+WebCache.h" 16 #import "UIImageView+WebCache.h"
18 17
19 @implementation FLAnimatedImageView (WebCache) 18 @implementation FLAnimatedImageView (WebCache)
@@ -9,10 +9,17 @@ @@ -9,10 +9,17 @@
9 #ifdef SD_WEBP 9 #ifdef SD_WEBP
10 10
11 #import "UIImage+WebP.h" 11 #import "UIImage+WebP.h"
  12 +#import "NSImage+WebCache.h"
  13 +
  14 +#if __has_include(<webp/decode.h>) && __has_include(<webp/mux_types.h>) && __has_include(<webp/demux.h>)
  15 +#import <webp/decode.h>
  16 +#import <webp/mux_types.h>
  17 +#import <webp/demux.h>
  18 +#else
12 #import "webp/decode.h" 19 #import "webp/decode.h"
13 #import "webp/mux_types.h" 20 #import "webp/mux_types.h"
14 #import "webp/demux.h" 21 #import "webp/demux.h"
15 -#import "NSImage+WebCache.h" 22 +#endif
16 23
17 #import "objc/runtime.h" 24 #import "objc/runtime.h"
18 25