Add DFCompositeImageDecoder, DFAnimatedImageDecoder, DFWebPImageDecoder

Demo/Tests/Source/TDFImageFormats.m

@@ -20,8 +20,8 @@ @implementation TDFImageFormats
 - (void)testThatWebPIsDecoded {
     NSData *data = [self _webpImageData];
     XCTAssertEqual(data.length, 118042);
-    XCTAssertTrue([UIImage df_isWebPData:data]);
-    UIImage *image = [UIImage df_imageWithWebPData:data];
+    id<DFImageDecoding> decoder = [DFWebPImageDecoder new];
+    UIImage *image = [decoder imageWithData:data partial:NO];
     XCTAssertNotNil(image);
     XCTAssertEqual(image.size.width, 768);
     XCTAssertEqual(image.size.height, 768);

Pod/Source/Core/Processing/DFImageDecoder.h

@@ -18,3 +18,12 @@
 + (void)setSharedDecoder:(nullable id<DFImageDecoding>)sharedDecoder;
 
 @end
+
+
+/*! Composes image decoders.
+*/
+@interface DFCompositeImageDecoder : NSObject <DFImageDecoding>
+
+- (nonnull instancetype)initWithDecoders:(nonnull NSArray <id<DFImageDecoding>> *)decoders;
+
+@end

Pod/Source/Core/Processing/DFImageDecoder.m

@@ -20,30 +20,7 @@
 
 @implementation DFImageDecoder
 
-#pragma mark <DFImageDecoding>
-
 - (nullable UIImage *)imageWithData:(nonnull NSData *)data partial:(BOOL)partial {
-    if (!data.length) {
-        return nil;
-    }
-#if __has_include("DFImageManagerKit+GIF.h")
-    if ([DFAnimatedImage isAnimatedGIFData:data]) {
-        UIImage *image = [DFAnimatedImage animatedImageWithGIFData:data];
-        if (image) {
-            return image;
-        }
-    }
-#endif
-
-#if __has_include("DFImageManagerKit+WebP.h")
-    if ([UIImage df_isWebPData:data] && !partial) {
-        UIImage *image = [UIImage df_imageWithWebPData:data];
-        if (image) {
-            return image;
-        }
-    }
-#endif
-
 #if __IPHONE_OS_VERSION_MIN_REQUIRED && !__WATCH_OS_VERSION_MIN_REQUIRED
     return [UIImage imageWithData:data scale:[UIScreen mainScreen].scale];
 #else
@@ -57,7 +34,15 @@ - (nullable UIImage *)imageWithData:(nonnull NSData *)data partial:(BOOL)partial
 static OSSpinLock _lock = OS_SPINLOCK_INIT;
 
 + (void)initialize {
-    [self setSharedDecoder:[DFImageDecoder new]];
+    NSMutableArray *decoders = [NSMutableArray new];
+#if __has_include("DFImageManagerKit+GIF.h")
+    [decoders addObject:[DFAnimatedImageDecoder new]];
+#endif
+#if __has_include("DFImageManagerKit+WebP.h")
+    [decoders addObject:[DFWebPImageDecoder new]];
+#endif
+    [decoders addObject:[DFImageDecoder new]];
+    [self setSharedDecoder:[[DFCompositeImageDecoder alloc] initWithDecoders:decoders]];
 }
 
 + (nullable id<DFImageDecoding>)sharedDecoder {
@@ -75,3 +60,27 @@ + (void)setSharedDecoder:(nullable id<DFImageDecoding>)sharedDecoder {
 }
 
 @end
+
+
+@implementation DFCompositeImageDecoder {
+    NSArray <id<DFImageDecoding>> *_decoders;
+}
+
+- (instancetype)initWithDecoders:(NSArray<id<DFImageDecoding>> *)decoders {
+    if (self = [super init]) {
+        _decoders = [NSArray arrayWithArray:decoders];
+    }
+    return self;
+}
+
+- (UIImage *)imageWithData:(NSData *)data partial:(BOOL)partial {
+    for (id<DFImageDecoding> decoder in _decoders) {
+        UIImage *image = [decoder imageWithData:data partial:partial];
+        if (image) {
+            return image;
+        }
+    }
+    return nil;
+}
+
+@end

Pod/Source/GIF/DFAnimatedImage.h

@@ -5,24 +5,16 @@
 #import <UIKit/UIKit.h>
 #import <FLAnimatedImage/FLAnimatedImage.h>
 
-/*! The DFAnimatedImage subclasses UIImage and represents a poster image for the underlying animated image. It is a regular UIImage that doesn't override any of the native UIImage behaviours it can be used anywhere where a regular `UIImage` can be used.
+/*! The DFAnimatedImage subclasses UIImage and represents a poster image for the underlying animated image. It can be used anywhere where a regular `UIImage` can be used.
  */
 @interface DFAnimatedImage : UIImage
 
 /* The animated image that the receiver was initialized with. An `FLAnimatedImage`'s job is to deliver frames in a highly performant way and works in conjunction with `FLAnimatedImageView`.
  */
 @property (nonnull, nonatomic, readonly) FLAnimatedImage *animatedImage;
 
-/*! Initializes the DFAnimatedImage with an instance of FLAnimatedImage class.
+/*! Initializes the DFAnimatedImage with an instance of FLAnimatedImage class and poster image.
  */
-- (nonnull instancetype)initWithAnimatedImage:(nonnull FLAnimatedImage *)animatedImage NS_DESIGNATED_INITIALIZER;
-
-/*! Returns the DFAnimatedImage object with an instance of FLAnimatedImage class created from a given data.
- */
-+ (nullable instancetype)animatedImageWithGIFData:(nullable NSData *)data;
-
-/*! Returns YES if the data represents an animated GIF.
- */
-+ (BOOL)isAnimatedGIFData:(nullable NSData *)data;
+- (nonnull instancetype)initWithAnimatedImage:(nonnull FLAnimatedImage *)animatedImage posterImage:(nonnull CGImageRef)posterImage posterImageScale:(CGFloat)posterImageScale posterImageOrientation:(UIImageOrientation)posterImageOrientation NS_DESIGNATED_INITIALIZER;
 
 @end

Pod/Source/GIF/DFAnimatedImage.m

@@ -6,28 +6,11 @@
 
 @implementation DFAnimatedImage
 
-- (instancetype)initWithAnimatedImage:(FLAnimatedImage *)animatedImage {
-    if (self = [super initWithCGImage:animatedImage.posterImage.CGImage]) {
+- (instancetype)initWithAnimatedImage:(FLAnimatedImage *)animatedImage posterImage:(CGImageRef)posterImage posterImageScale:(CGFloat)posterImageScale posterImageOrientation:(UIImageOrientation)posterImageOrientation {
+    if (self = [super initWithCGImage:posterImage scale:posterImageScale orientation:posterImageOrientation]) {
         _animatedImage = animatedImage;
     }
     return self;
 }
 
-+ (nullable instancetype)animatedImageWithGIFData:(nullable NSData *)data {
-    FLAnimatedImage *animatedImage = [FLAnimatedImage animatedImageWithGIFData:data];
-    return animatedImage ? [[DFAnimatedImage alloc] initWithAnimatedImage:animatedImage] : nil;
-}
-
-/*! See https://en.wikipedia.org/wiki/List_of_file_signatures
- */
-+ (BOOL)isAnimatedGIFData:(nullable NSData *)data {
-    const NSInteger sigLength = 3;
-    if (data.length < sigLength) {
-        return NO;
-    }
-    uint8_t sig[sigLength];
-    [data getBytes:&sig length:sigLength];
-    return sig[0] == 0x47 && sig[1] == 0x49 && sig[2] == 0x46;
-}
-
 @end

Pod/Source/GIF/DFAnimatedImageDecoder.h

@@ -0,0 +1,9 @@
+// The MIT License (MIT)
+//
+// Copyright (c) 2015 Alexander Grebenyuk (github.com/kean).
+
+#import <UIKit/UIKit.h>
+#import "DFImageDecoding.h"
+
+@interface DFAnimatedImageDecoder : NSObject <DFImageDecoding>
+@end

Pod/Source/GIF/DFAnimatedImageDecoder.m

@@ -0,0 +1,38 @@
+// The MIT License (MIT)
+//
+// Copyright (c) 2015 Alexander Grebenyuk (github.com/kean).
+
+#import "DFAnimatedImageDecoder.h"
+#import "DFAnimatedImage.h"
+
+@implementation DFAnimatedImageDecoder
+
+- (UIImage *)imageWithData:(NSData *)data partial:(BOOL)partial {
+    if (![self _isGIFData:data]) {
+        return nil;
+    }
+    FLAnimatedImage *animatedImage = [FLAnimatedImage animatedImageWithGIFData:data];
+    if (!animatedImage) {
+        return nil;
+    }
+    UIImage *posterImage = animatedImage.posterImage;
+    CGImageRef posterImageRef = posterImage.CGImage;
+    if (!posterImageRef) {
+        return nil;
+    }
+    return [[DFAnimatedImage alloc] initWithAnimatedImage:animatedImage posterImage:posterImageRef posterImageScale:posterImage.scale posterImageOrientation:posterImage.imageOrientation];
+}
+
+/*! See https://en.wikipedia.org/wiki/List_of_file_signatures
+ */
+- (BOOL)_isGIFData:(NSData *)data {
+    const NSInteger sigLength = 3;
+    if (data.length < sigLength) {
+        return NO;
+    }
+    uint8_t sig[sigLength];
+    [data getBytes:&sig length:sigLength];
+    return sig[0] == 0x47 && sig[1] == 0x49 && sig[2] == 0x46;
+}
+
+@end

Pod/Source/GIF/DFImageManagerKit+GIF.h

@@ -3,3 +3,4 @@
 // Copyright (c) 2015 Alexander Grebenyuk (github.com/kean).
 
 #import "DFAnimatedImage.h"
+#import "DFAnimatedImageDecoder.h"

Pod/Source/WebP/DFImageManagerKit+WebP.h

@@ -2,4 +2,4 @@
 //
 // Copyright (c) 2015 Alexander Grebenyuk (github.com/kean).
 
-#import "UIImage+DFImageManagerWebP.h"
+#import "DFWebPImageDecoder.h"

Pod/Source/WebP/DFWebPImageDecoder.h

@@ -0,0 +1,9 @@
+// The MIT License (MIT)
+//
+// Copyright (c) 2015 Alexander Grebenyuk (github.com/kean).
+
+#import <UIKit/UIKit.h>
+#import "DFImageDecoding.h"
+
+@interface DFWebPImageDecoder : NSObject <DFImageDecoding>
+@end

Pod/Source/WebP/UIImage+DFImageManagerWebP.m → Pod/Source/WebP/DFWebPImageDecoder.m

@@ -2,27 +2,22 @@
 //
 // Copyright (c) 2015 Alexander Grebenyuk (github.com/kean).
 
-#import "UIImage+DFImageManagerWebP.h"
+#import "DFWebPImageDecoder.h"
 #import <libwebp/webp/decode.h>
 
-@implementation UIImage (DFImageManagerWebP)
-
-+ (BOOL)df_isWebPData:(nullable NSData *)data {
-    const NSInteger sigLength = 12;
-    if (data.length < sigLength) {
-        return NO;
-    }
-    uint8_t sig[sigLength];
-    [data getBytes:&sig length:sigLength];
-    // RIFF----WEBP
-    return (sig[0] == 0x52 && sig[1] == 0x49 && sig[2] == 0x46 && sig[3] == 0x46 && sig[8] == 0x57 && sig[9] == 0x45 && sig[10] == 0x42 && sig[11] == 0x50);
-}
+@implementation DFWebPImageDecoder
 
 static void FreeImageData(void *info, const void *data, size_t size) {
     free((void *)data);
 }
 
-+ (nullable UIImage *)df_imageWithWebPData:(nullable NSData *)data {
+- (UIImage *)imageWithData:(NSData *)data partial:(BOOL)partial {
+    if (partial) {
+        return nil;
+    }
+    if (![self _isWebPData:data]) {
+        return nil;
+    }
     WebPDecoderConfig config;
     if (!WebPInitDecoderConfig(&config)) {
         return nil;
@@ -55,4 +50,15 @@ + (nullable UIImage *)df_imageWithWebPData:(nullable NSData *)data {
     return image;
 }
 
+- (BOOL)_isWebPData:(NSData *)data {
+    const NSInteger sigLength = 12;
+    if (data.length < sigLength) {
+        return NO;
+    }
+    uint8_t sig[sigLength];
+    [data getBytes:&sig length:sigLength];
+    // RIFF----WEBP
+    return (sig[0] == 0x52 && sig[1] == 0x49 && sig[2] == 0x46 && sig[3] == 0x46 && sig[8] == 0x57 && sig[9] == 0x45 && sig[10] == 0x42 && sig[11] == 0x50);
+}
+
 @end