Update TIP to 2.9.0 (#30)

- Fix race condition bug in downloader code
- Move TIPImageViewFetchHelper to supporting UIView
- Improve rendered cache
- Wide gamut color support

Author: NSProgrammer

.travis.yml

@@ -1,4 +1,4 @@
 language: objective-c
-osx_image: xcode8.2
+osx_image: xcode9.2
 script:
   ./build.sh

CHANGELOG.md

@@ -2,14 +2,33 @@
 
 ## Info
 
-**Document version:** 2.7.2
+**Document version:** 2.9.0
 
-**Last updated:** 10/24/2017
+**Last updated:** 02/01/2018
 
 **Author:** Nolan O'Brien
 
 ## History
 
+### 2.9.0
+
+- Add P3 color gamut support
+  - Image scaling preserves P3 (on device's with P3 screens) now
+  - Add functions to check if a screen supports P3
+  - Add category property to UIImage to check if image has P3 colorspace
+
+### 2.8.1
+
+- Persist source image dimensions for Rendered Cache
+  - this provides more context about the source image, such as knowing if the displayed image was scaled up or scaled down
+  - also added new "RMem" value when showing info with debug info feature on `TIPImageViewFetchHelper`
+  - improve `TIPImageViewFetchHelper` when reloading an image after a new "matching" image was cached (such as a larger resolution)
+
+### 2.8.0
+
+- Move `TIPImageViewFetchHelper` from using `UIImageView` instances directly to using `UIView` with `TIPImageFetchable` protocol
+  - makes it possible for  `UIView` subclasses to support the fetch helper, like `UIButton` or a custom view
+
 ### 2.7.2
 
 - improve `TIPImageFetchTransformer` support with optional identifier

Extended/TIPXMP4Codec.m

@@ -58,7 +58,7 @@ __strong tipx_defer_block_t tipx_macro_concat(tipx_stack_defer_block_, __LINE__)
 
 #pragma mark - Declarations
 
-static CGImageRef TIPX_CGImageFromCMSampleBuffer(CMSampleBufferRef sample);
+static CGImageRef TIPX_CGImageCreateFromCMSampleBuffer(CMSampleBufferRef sample) CF_RETURNS_RETAINED;
 
 @interface TIPXMP4DecoderConfigInternal : NSObject <TIPXMP4DecoderConfig>
 - (instancetype)initWithMaxDecodableFramesCount:(NSUInteger)max;
@@ -281,7 +281,7 @@ - (TIPImageContainer *)renderImageWithMode:(TIPImageDecoderRenderMode)mode
                 continue;
             }
 
-            CGImageRef imageRef = TIPX_CGImageFromCMSampleBuffer(sample);
+            CGImageRef imageRef = TIPX_CGImageCreateFromCMSampleBuffer(sample);
             TIPXDeferRelease(imageRef);
 
             if (imageRef) {
@@ -432,7 +432,7 @@ - (instancetype)initWithMaxDecodableFramesCount:(NSUInteger)max
 
 @end
 
-static CGImageRef TIPX_CGImageFromCMSampleBuffer(CMSampleBufferRef sampleBuffer)
+static CGImageRef TIPX_CGImageCreateFromCMSampleBuffer(CMSampleBufferRef sampleBuffer)
 {
     CVImageBufferRef imageBuffer = sampleBuffer ? CMSampleBufferGetImageBuffer(sampleBuffer) : NULL;
     if (!imageBuffer) {

ImageSpeedComparison/Base.lproj/Main.storyboard

@@ -1,13 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="12120" systemVersion="16E195" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" colorMatched="YES" initialViewController="vXZ-lx-hvc">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="13771" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" colorMatched="YES" initialViewController="vXZ-lx-hvc">
     <device id="retina4_7" orientation="portrait">
         <adaptation id="fullscreen"/>
     </device>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="12088"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13772"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
+    <customFonts key="customFonts">
+        <array key="Menlo.ttc">
+            <string>Menlo-Regular</string>
+        </array>
+    </customFonts>
     <scenes>
         <!--View Controller-->
         <scene sceneID="ufC-wZ-h7g">
@@ -38,8 +43,8 @@
                                     <action selector="select:" destination="vXZ-lx-hvc" eventType="touchUpInside" id="B6A-d6-A5q"/>
                                 </connections>
                             </button>
-                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" id="e4K-h7-ONX">
-                                <rect key="frame" x="260" y="433" width="99" height="30"/>
+                            <button opaque="NO" contentMode="scaleToFill" misplaced="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" id="e4K-h7-ONX">
+                                <rect key="frame" x="260" y="479" width="99" height="30"/>
                                 <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
                                 <state key="normal" title="Start">
                                     <color key="titleShadowColor" red="0.5" green="0.5" blue="0.5" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
@@ -106,9 +111,4 @@ Final Size: N/A</string>
             <point key="canvasLocation" x="214.5" y="250.5"/>
         </scene>
     </scenes>
-    <simulatedMetricsContainer key="defaultSimulatedMetrics">
-        <simulatedStatusBarMetrics key="statusBar"/>
-        <simulatedOrientationMetrics key="orientation"/>
-        <simulatedScreenMetrics key="destination" type="retina4_7.fullscreen"/>
-    </simulatedMetricsContainer>
 </document>

ImageSpeedComparison/ViewController.m

@@ -119,6 +119,12 @@ - (void)viewDidLayoutSubviews
     frame.origin.y = CGRectGetMaxY(_selectImageTypeButton.frame) + 5;
     _selectSpeedButton.frame = frame;
 
+    frame = _selectSpeedButton.frame;
+    frame.origin.y += frame.size.height;
+    frame.size = _blurSwitch.bounds.size;
+    frame.origin.x = self.view.bounds.size.width - (frame.size.width + 5);
+    _blurSwitch.frame = frame;
+
     frame = _startButton.frame;
     frame.origin.y = CGRectGetMaxY(_selectSpeedButton.frame) + 5;
     _startButton.frame = frame;

README.md

@@ -210,8 +210,8 @@ image pipeline works.
   - powerful class that can encapsulate the majority of use cases for loading an image and displaying it in a `UIImageView`
   - 99% of image loading and displaying use cases can be solved by using this class, configuring it and providing a delegate and/or data source
   - having the logic in this class avoid coupling _controller_ code with _view_ code in the _MVC_ practice
-- `UIImageView(TIPImageViewFetchHelper)`
-  - convenience category on `UIImageView` for associating a `TIPImageViewFetchHelper`
+- `UIView(TIPImageFetchable)` and `UIImageView(TIPImageFetchable)`
+  - convenience categories on `UIImageView` and `UIView` for associating a `TIPImageViewFetchHelper`
 
 ## Usage
 

TIP Sample App/TwitterSearchViewController.m

@@ -218,7 +218,7 @@ - (nullable TIPImagePipeline *)tip_imagePipelineForFetchHelper:(nonnull TIPImage
         return nil;
     }
 
-    TweetImageFetchRequest *request = [[TweetImageFetchRequest alloc] initWithTweetImage:tweetImage targetView:helper.fetchImageView];
+    TweetImageFetchRequest *request = [[TweetImageFetchRequest alloc] initWithTweetImage:tweetImage targetView:helper.fetchView];
     request.forcePlaceholder = APP_DELEGATE.usePlaceholder;
     return request;
 }
@@ -243,7 +243,7 @@ - (BOOL)tip_fetchHelper:(nonnull TIPImageViewFetchHelper *)helper shouldContinue
     }
 
     const CGSize originalDimensions = previewImageResult.imageOriginalDimensions;
-    const CGSize viewDimensions = TIPDimensionsFromView(helper.fetchImageView);
+    const CGSize viewDimensions = TIPDimensionsFromView(helper.fetchView);
     if (originalDimensions.height >= viewDimensions.height && originalDimensions.width >= viewDimensions.width) {
         return NO;
     }

TIP Swift Sample App/AppDelegate.swift

@@ -95,7 +95,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate, TIPImagePipelineObserver,
 
     // MARK: private functions
 
-    private func incrementNetworkOperations() -> Void
+    private func incrementNetworkOperations()
     {
         if (Thread.isMainThread) {
             self.incOps()
@@ -106,7 +106,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate, TIPImagePipelineObserver,
         }
     }
 
-    private func decrementNetworkOperations() -> Void
+    private func decrementNetworkOperations()
     {
         if (Thread.isMainThread) {
             self.decOps()
@@ -117,15 +117,15 @@ class AppDelegate: UIResponder, UIApplicationDelegate, TIPImagePipelineObserver,
         }
     }
 
-    private func incOps() -> Void
+    private func incOps()
     {
         self.opCount += 1
         if (self.opCount > 0) {
             UIApplication.shared.isNetworkActivityIndicatorVisible = true
         }
     }
 
-    private func decOps() -> Void
+    private func decOps()
     {
         self.opCount -= 1
         if (self.opCount <= 0) {
@@ -163,26 +163,18 @@ class AppDelegate: UIResponder, UIApplicationDelegate, TIPImagePipelineObserver,
     {
         let levelString: String
         switch (level) {
-            case .emergency:
-                fallthrough
-            case .alert:
-                fallthrough
-            case .critical:
-                fallthrough
-            case .error:
-                levelString = "ERR"
-                break
-            case .warning:
-                levelString = "WRN"
-                break
-            case .notice:
-                fallthrough
-            case .information:
-                levelString = "INF"
-                break
-            case .debug:
-                levelString = "DBG"
-                break
+        case .emergency,
+             .alert,
+             .critical,
+             .error:
+            levelString = "ERR"
+        case .warning:
+            levelString = "WRN"
+        case .notice,
+             .information:
+            levelString = "INF"
+        case .debug:
+            levelString = "DBG"
         }
 
         print("[\(levelString): \(message)")

TIP Swift Sample App/Assets.xcassets/AppIcon.appiconset/Contents.json

@@ -39,11 +39,6 @@
       "idiom" : "iphone",
       "size" : "60x60",
       "scale" : "3x"
-    },
-    {
-      "idiom" : "ios-marketing",
-      "size" : "1024x1024",
-      "scale" : "1x"
     }
   ],
   "info" : {

TIP Swift Sample App/TweetImageFetchRequest.swift

@@ -35,36 +35,32 @@ class TweetImageFetchRequest: NSObject, TIPImageFetchRequest {
 
     @objc var targetDimensions: CGSize
     @objc var targetContentMode: UIViewContentMode
+
     @objc var imageIdentifier: String? {
-        get {
-            return self.tweetImageInfo.baseURLString
-        }
+        return self.tweetImageInfo.baseURLString
     }
+
     @objc var imageURL: URL {
-        get {
-            if nil == self.internalImageURL {
-                if self.forcePlaceholder {
-                    self.internalImageURL = URL.init(string: "placeholder://placeholder.com/placeholder.jpg")
+        if nil == self.internalImageURL {
+            if self.forcePlaceholder {
+                self.internalImageURL = URL.init(string: "placeholder://placeholder.com/placeholder.jpg")
+            } else {
+                let URLString: String
+                if self.tweetImageInfo.baseURLString.hasPrefix("https://pbs.twimg.com/media/") {
+                    let variantName = TweetImageDetermineVariant(self.tweetImageInfo.originalDimensions, self.targetDimensions, self.targetContentMode)
+                    let format = APP_DELEGATE().searchWebP ? "webp" : self.tweetImageInfo.format
+                    URLString = "\(self.tweetImageInfo.baseURLString)?format=\(format)&name=\(variantName)"
                 } else {
-                    let URLString: String
-                    if self.tweetImageInfo.baseURLString.hasPrefix("https://pbs.twimg.com/media/") {
-                        let variantName = TweetImageDetermineVariant(self.tweetImageInfo.originalDimensions, self.targetDimensions, self.targetContentMode)
-                        let format = APP_DELEGATE().searchWebP ? "webp" : self.tweetImageInfo.format
-                        URLString = "\(self.tweetImageInfo.baseURLString)?format=\(format)&name=\(variantName)"
-                    } else {
-                        URLString = "\(self.tweetImageInfo.baseURLString).\(self.tweetImageInfo.format)"
-                    }
-                    self.internalImageURL = URL.init(string: URLString)
+                    URLString = "\(self.tweetImageInfo.baseURLString).\(self.tweetImageInfo.format)"
                 }
+                self.internalImageURL = URL.init(string: URLString)
             }
-
-            return self.internalImageURL!
         }
+
+        return self.internalImageURL!
     }
     @objc var options: TIPImageFetchOptions {
-        get {
-            return self.forcePlaceholder ? [.treatAsPlaceholder] : []
-        }
+        return self.forcePlaceholder ? [.treatAsPlaceholder] : []
     }
 
     init(tweetImage tweet: TweetImageInfo, targetView view: UIView?)

TIP Swift Sample App/TwitterSearchViewController.swift

@@ -96,7 +96,7 @@ class TweetWithMediaTableViewCell: UITableViewCell, TIPImageViewFetchHelperDataS
             return nil
         }
 
-        let request = TweetImageFetchRequest.init(tweetImage: tweetImage, targetView: helper.fetchImageView)
+        let request = TweetImageFetchRequest.init(tweetImage: tweetImage, targetView: helper.fetchView)
         request.forcePlaceholder = APP_DELEGATE().usePlaceholder
         return request
     }
@@ -121,7 +121,7 @@ class TweetWithMediaTableViewCell: UITableViewCell, TIPImageViewFetchHelperDataS
             }
         }
 
-        guard let fetchImageView = helper.fetchImageView else {
+        guard let fetchImageView = helper.fetchView else {
             // don't have a view to compare with, stop
             return false
         }
@@ -268,12 +268,12 @@ class TwitterSearchViewController: UIViewController, UISearchResultsUpdating, UI
         self.searchController!.searchBar.isUserInteractionEnabled = false
         searchBar.text = self.term
 
-        TwitterAPI.sharedInstance().search(forTerm: (nil != self.term) ? self.term! : "",  count: APP_DELEGATE().searchCount, complete: {
-            tweets, error in
+        TwitterAPI.sharedInstance().search(forTerm: (nil != self.term) ? self.term! : "",  count: APP_DELEGATE().searchCount) { tweets, _ in
+
             self.tweets = tweets
             self.searchController?.searchBar.isUserInteractionEnabled = true
             self.tableView?.reloadData()
-        })
+        }
     }
 
     func willPresentSearchController(_ searchController: UISearchController)

TwitterImagePipeline.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = 'TwitterImagePipeline'
-  s.version          = '2.7.2'
+  s.version          = '2.9.0'
   s.summary          = 'Twitter Image Pipeline is a robust and performant image loading and caching framework for iOS'
   s.description      = 'Twitter created a framework for image loading/caching in order to fulfill the numerous needs of Twitter for iOS including being fast, safe, modular and versatile.'
   s.homepage         = 'https://github.com/twitter/ios-twitter-logging-service'