Support ios10 and xcode8.

wangjwchn · Oct 27, 2016 · 5940cf9 · 5940cf9
1 parent 84db766
commit 5940cf9
Show file tree

Hide file tree

Showing 6 changed files with 31 additions and 13 deletions.
diff --git a/AImage.xcodeproj/project.pbxproj b/AImage.xcodeproj/project.pbxproj
@@ -94,12 +94,13 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 0730;
-				LastUpgradeCheck = 0720;
+				LastUpgradeCheck = 0800;
 				ORGANIZATIONNAME = JW;
 				TargetAttributes = {
 					280E30151C8AD8CF002ACA3D = {
 						CreatedOnToolsVersion = 7.2.1;
 						DevelopmentTeam = 7EGABX8KQS;
+						LastSwiftMigration = 0800;
 					};
 				};
 			};
@@ -156,8 +157,10 @@
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
@@ -204,8 +207,10 @@
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
@@ -225,6 +230,7 @@
 				IPHONEOS_DEPLOYMENT_TARGET = 9.2;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
+				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
 				TARGETED_DEVICE_FAMILY = "1,2";
 				VALIDATE_PRODUCT = YES;
 				VERSIONING_SYSTEM = "apple-generic";
@@ -236,6 +242,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				CLANG_ENABLE_MODULES = YES;
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
 				DEFINES_MODULE = YES;
 				DYLIB_COMPATIBILITY_VERSION = 1;
 				DYLIB_CURRENT_VERSION = 1;
@@ -247,13 +254,15 @@
 				PRODUCT_NAME = AImage;
 				SKIP_INSTALL = YES;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
+				SWIFT_VERSION = 2.3;
 			};
 			name = Debug;
 		};
 		280E30201C8AD8CF002ACA3D /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				CLANG_ENABLE_MODULES = YES;
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
 				DEFINES_MODULE = YES;
 				DYLIB_COMPATIBILITY_VERSION = 1;
 				DYLIB_CURRENT_VERSION = 1;
@@ -264,6 +273,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = me.wjw.AniImage;
 				PRODUCT_NAME = AImage;
 				SKIP_INSTALL = YES;
+				SWIFT_VERSION = 2.3;
 			};
 			name = Release;
 		};

diff --git a/AImage.xcodeproj/xcshareddata/xcschemes/AImage.xcscheme b/AImage.xcodeproj/xcshareddata/xcschemes/AImage.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0720"
+   LastUpgradeVersion = "0800"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/AImage/AImage.swift b/AImage/AImage.swift
@@ -12,8 +12,6 @@ import UIKit
 let DEFAULT_CLARITY:Float = 0.8
 let FLOAT_EPS:Float = 1E-6
 let CHECK_INTERVAL = [60,30,20,15,12,10,6,5,4,3,2,1]
-let GIF_ID = "GIF"
-let APNG_ID = "PNG"
 
 let _imageStorageKey = malloc(8)
 public extension UIImage
@@ -58,14 +56,15 @@ public extension UIImage
         }
 
         var frameProperties = [CFDictionary]()
-     if(CFDictionaryContainsKey(imageProperties[1],unsafeAddressOf("{GIF}"))){
+
+     if(CFDictionaryContainsKey(imageProperties[1],unsafeAddressOf(kCGImagePropertyGIFDictionary))){
             frameProperties = imageProperties.map(){
-                unsafeBitCast(CFDictionaryGetValue($0,unsafeAddressOf("{GIF}")),CFDictionary.self)
+                unsafeBitCast(CFDictionaryGetValue($0,unsafeAddressOf(kCGImagePropertyGIFDictionary)),CFDictionary.self)
             }//gif
         }
-        else if(CFDictionaryContainsKey(imageProperties[1],unsafeAddressOf("{PNG}"))){
+        else if(CFDictionaryContainsKey(imageProperties[1],unsafeAddressOf(kCGImagePropertyPNGDictionary))){
             frameProperties = imageProperties.map(){
-            unsafeBitCast(CFDictionaryGetValue($0,unsafeAddressOf("{PNG}")),CFDictionary.self)
+            unsafeBitCast(CFDictionaryGetValue($0,unsafeAddressOf(kCGImagePropertyPNGDictionary)),CFDictionary.self)
             }//apng
         }
         else{

diff --git a/AImage/AImageView.swift b/AImage/AImageView.swift
@@ -56,16 +56,17 @@ public extension UIImageView{
     func prepareCache(){
         self.m_!.cache = NSCache()
         for i in 0..<self.GetAImage().GetDisplayOrder().count {
-            let image = UIImage(CGImage: CGImageSourceCreateImageAtIndex(self.GetAImage().GetImageSource(),self.GetAImage().GetDisplayOrder()[i],nil)!)
+            let image = UIImage(CGImage: CGImageSourceCreateImageAtIndex(self.GetAImage().GetImageSource(),self.GetAImage().GetDisplayOrder()[i],[(kCGImageSourceShouldCacheImmediately as String): kCFBooleanTrue])!)
             self.GetImageCache().setObject(image,forKey:i)
         }
     }
+
     //bound to 'displayLink'
     func updateFrameWithoutCache(){
         if(self.GetPlayJudge() == true){
             self.image = self.GetCurrentImage()
             dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_HIGH,0)){
-                self.m_!.currentImage = UIImage(CGImage: CGImageSourceCreateImageAtIndex(self.GetAImage().GetImageSource(),self.GetAImage().GetDisplayOrder()[self.GetDisplayOrderIndex()],[(kCGImageSourceShouldCacheImmediately as String): true])!)
+            self.m_!.currentImage = UIImage(CGImage: CGImageSourceCreateImageAtIndex(self.GetAImage().GetImageSource(),self.GetAImage().GetDisplayOrder()[self.GetDisplayOrderIndex()],[(kCGImageSourceShouldCacheImmediately as String): kCFBooleanFalse])!)
                 self.m_!.displayOrderIndex = (self.GetDisplayOrderIndex()+1)%self.GetAImage().GetImageNumber()
             }
         }

diff --git a/Sample/AImageSample.xcodeproj/project.pbxproj b/Sample/AImageSample.xcodeproj/project.pbxproj
@@ -153,12 +153,13 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 0730;
-				LastUpgradeCheck = 0730;
+				LastUpgradeCheck = 0800;
 				ORGANIZATIONNAME = wangjwchn;
 				TargetAttributes = {
 					28C66A401D6EED84005B88CE = {
 						CreatedOnToolsVersion = 7.3.1;
 						DevelopmentTeam = 7EGABX8KQS;
+						LastSwiftMigration = 0800;
 						ProvisioningStyle = Automatic;
 					};
 				};
@@ -266,8 +267,10 @@
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
@@ -312,8 +315,10 @@
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
@@ -332,6 +337,7 @@
 				IPHONEOS_DEPLOYMENT_TARGET = 9.3;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
+				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
 				TARGETED_DEVICE_FAMILY = "1,2";
 				VALIDATE_PRODUCT = YES;
 			};
@@ -347,6 +353,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = me.wjw.AImageSample;
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				SWIFT_VERSION = 2.3;
 			};
 			name = Debug;
 		};
@@ -360,6 +367,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = me.wjw.AImageSample;
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				SWIFT_VERSION = 2.3;
 			};
 			name = Release;
 		};

diff --git a/Sample/AImageSample/ViewController.swift b/Sample/AImageSample/ViewController.swift
@@ -37,7 +37,7 @@ class ViewController: UIViewController {
         let image = UIImage(AImageData:imageData!)
 
         let imageview = UIImageView(AImage: image)
-        imageview.frame = CGRect(x: 7.0, y: 50.0, width: 400.0, height: 224.0)
+        imageview.frame = CGRect(x: 0.0, y: 50.0, width: 380.0, height: 212.0)
         view.addSubview(imageview)
         imageview.APlay();
 
@@ -47,7 +47,7 @@ class ViewController: UIViewController {
 
         let image = UIImage(AImageData:imageData!)
         let imageview = UIImageView(AImage: image)
-        imageview.frame = CGRect(x: 7.0, y: 50.0, width: 400.0, height: 224.0)
+        imageview.frame = CGRect(x: 7.0, y: 50.0, width: 380.0, height: 212.0)
         view.addSubview(imageview)
         imageview.APlay();
     }