diff --git a/Source/Animator.swift b/Source/Animator.swift
index f10cff6..37ce26d 100644
--- a/Source/Animator.swift
+++ b/Source/Animator.swift
@@ -103,12 +103,12 @@ class Animator {
timeSinceLastFrameChange -= frameDuration
let lastFrameIndex = currentFrameIndex
- currentFrameIndex = ++currentFrameIndex % animatedFrames.count
+ currentFrameIndex = (currentFrameIndex + 1) % animatedFrames.count
// Loads the next needed frame for progressive loading
if animatedFrames.count < frameCount {
animatedFrames[lastFrameIndex] = prepareFrame(currentPreloadIndex)
- currentPreloadIndex = ++currentPreloadIndex % frameCount
+ currentPreloadIndex = (currentFrameIndex + 1) % frameCount
}
return true
diff --git a/Source/ImageSourceHelpers.swift b/Source/ImageSourceHelpers.swift
index 135e6a1..1661245 100755
--- a/Source/ImageSourceHelpers.swift
+++ b/Source/ImageSourceHelpers.swift
@@ -32,16 +32,17 @@ func capDuration(duration: Double) -> Double? {
///
/// - returns: A frame duration.
func durationFromGIFProperties(properties: GIFProperties) -> Double? {
- let unclampedDelayTime = properties[String(kCGImagePropertyGIFUnclampedDelayTime)]
- let delayTime = properties[String(kCGImagePropertyGIFDelayTime)]
+ guard let unclampedDelayTime = properties[String(kCGImagePropertyGIFUnclampedDelayTime)],
+ let delayTime = properties[String(kCGImagePropertyGIFDelayTime)]
+ else { return .None }
- return duration <^> unclampedDelayTime <*> delayTime
+ return duration(unclampedDelayTime, delayTime: delayTime)
}
/// Calculates frame duration based on both clamped and unclamped times.
///
/// - returns: A frame duration.
-func duration(unclampedDelayTime: Double)(delayTime: Double) -> Double {
+func duration(unclampedDelayTime: Double, delayTime: Double) -> Double {
let delayArray = [unclampedDelayTime, delayTime]
return delayArray.filter(isPositive).first ?? defaultDuration
}
diff --git a/Source/Info.plist b/Source/Info.plist
index c5090c0..05ccf4b 100644
--- a/Source/Info.plist
+++ b/Source/Info.plist
@@ -15,11 +15,11 @@
CFBundlePackageType
FMWK
CFBundleShortVersionString
- 1.0.1
+ 1.1.0
CFBundleSignature
????
CFBundleVersion
- 79
+ 87
NSPrincipalClass