Merge branch 'mackuba-master' into 1.4.1-development

* mackuba-master:
  marked some methods as public
  added a CocoaPods podspec file

SwiftGif.podspec

@@ -0,0 +1,17 @@
+Pod::Spec.new do |s|
+  s.name         = 'SwiftGif'
+  s.version      = '1.3.1'
+  s.summary      = 'A small UIImage extension with gif support'
+  s.homepage     = 'https://github.com/bahlo/SwiftGif'
+  s.license      = 'MIT'
+  s.author       = { 'Arne Bahlo': 'hallo@arne.me' }
+
+  s.ios.deployment_target = '8.0'
+
+  s.source = {
+    git: 'https://github.com/bahlo/SwiftGif.git',
+    tag: 'v1.3.1'
+  }
+
+  s.source_files = 'SwiftGifCommon/*.swift'
+end

SwiftGifCommon/UIImage+Gif.swift

@@ -10,17 +10,17 @@ import UIKit
 import ImageIO
 
 extension UIImage {
-    
-    class func animatedImageWithData(data: NSData) -> UIImage? {
+
+    public class func animatedImageWithData(data: NSData) -> UIImage? {
         guard let source = CGImageSourceCreateWithData(data, nil) else { return nil }
 
         return UIImage.animatedImageWithSource(source)
     }
-    
+
     class func delayForImageAtIndex(index: Int, source: CGImageSource!)
         -> Double {
         var delay = 0.1
-        
+
         // Get dictionaries
         let cfProperties = CGImageSourceCopyPropertiesAtIndex(source, index, nil)
         let gifProperties: CFDictionaryRef = unsafeBitCast(
@@ -37,17 +37,17 @@ extension UIImage {
             delayObject = unsafeBitCast(CFDictionaryGetValue(gifProperties,
                 unsafeAddressOf(kCGImagePropertyGIFDelayTime)), AnyObject.self)
         }
-        
+
         delay = delayObject as! Double
-        
+
         if delay < 0.1 {
             delay = 0.1 // Make sure they're not too fast
         }
 
-        
+
         return delay
     }
-    
+
     class func gcdForPair(var a: Int?, var _ b: Int?) -> Int {
         // Check if one of them is nil
         if b == nil || a == nil {
@@ -59,19 +59,19 @@ extension UIImage {
                 return 0
             }
         }
-        
+
         // Swap for modulo
         if a < b {
             let c = a
             a = b
             b = c
         }
-        
+
         // Get greatest common divisor
         var rest: Int
         while true {
             rest = a! % b!
-            
+
             if rest == 0 {
                 return b! // Found it
             } else {
@@ -80,70 +80,70 @@ extension UIImage {
             }
         }
     }
-    
+
     class func gcdForArray(array: Array<Int>) -> Int {
         if array.isEmpty {
             return 1
         }
-        
+
         var gcd = array[0]
-        
+
         for val in array {
             gcd = UIImage.gcdForPair(val, gcd)
         }
-        
+
         return gcd
     }
-    
-    class func animatedImageWithSource(source: CGImageSource) -> UIImage? {
+
+    public class func animatedImageWithSource(source: CGImageSource) -> UIImage? {
         let count = CGImageSourceGetCount(source)
         var images = [CGImageRef]()
         var delays = [Int]()
-        
+
         // Fill arrays
         for i in 0..<count {
             // Add image
             if let image = CGImageSourceCreateImageAtIndex(source, i, nil) {
                 images.append(image)
             }
-            
+
             // At it's delay in cs
             let delaySeconds = UIImage.delayForImageAtIndex(Int(i),
                 source: source)
             delays.append(Int(delaySeconds * 1000.0)) // Seconds to ms
         }
-        
+
         // Calculate full duration
         let duration: Int = {
             var sum = 0
-            
+
             for val: Int in delays {
                 sum += val
             }
-            
+
             return sum
             }()
-        
+
         // Get frames
         let gcd = gcdForArray(delays)
         var frames = [UIImage]()
-        
+
         var frame: UIImage
         var frameCount: Int
         for i in 0..<count {
             frame = UIImage(CGImage: images[Int(i)])
             frameCount = Int(delays[Int(i)] / gcd)
-            
+
             for _ in 0..<frameCount {
                 frames.append(frame)
             }
         }
-        
+
         // Heyhey
         let animation = UIImage.animatedImageWithImages(frames,
             duration: Double(duration) / 1000.0)
-        
+
         return animation
     }
-    
+
 }