TouchInstinct
/
SKPhotoBrowser
307
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merge latest master.

This commit is contained in:
suzuki_keishi 2016-08-30 16:22:35 +09:00
parent d6ecf61405 b4d911bee3
commit fa6b95eebe
4 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
SKPhotoBrowser.podspec
View File

@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = "SKPhotoBrowser"
s.version = "2.0.2"
s.version = "2.0.4"
s.summary = "Simple PhotoBrowser/Viewer inspired by facebook, twitter photo browsers written by swift2.0."
s.homepage = "https://github.com/suzuki-0000/SKPhotoBrowser"
s.license = { :type => "MIT", :file => "LICENSE" }

3
SKPhotoBrowser.xcodeproj/project.pbxproj
View File

@ -220,6 +220,7 @@
TargetAttributes = {
8909B52F1BC791280060A053 = {
CreatedOnToolsVersion = 7.0;
LastSwiftMigration = 0800;
};
A64B89321CB04222000071B9 = {
CreatedOnToolsVersion = 7.3;
@ -430,6 +431,7 @@
PRODUCT_NAME = "$(TARGET_NAME)";
SKIP_INSTALL = YES;
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
SWIFT_VERSION = 2.3;
};
name = Debug;
};
@ -448,6 +450,7 @@
PRODUCT_BUNDLE_IDENTIFIER = com.keishi.suzuki.SKPhotoBrowser;
PRODUCT_NAME = "$(TARGET_NAME)";
SKIP_INSTALL = YES;
SWIFT_VERSION = 2.3;
};
name = Release;
};

4
SKPhotoBrowser/SKPhotoBrowser.swift
View File

@ -202,7 +202,7 @@ public class SKPhotoBrowser: UIViewController {
public func dismissPhotoBrowser(animated animated: Bool, completion: (Void -> Void)? = nil) {
prepareForClosePhotoBrowser()
if !animated {
modalTransitionStyle = .CrossDissolve
}
@ -633,4 +633,4 @@ extension SKPhotoBrowser: UIScrollViewDelegate {
public func scrollViewDidEndScrollingAnimation(scrollView: UIScrollView) {
isEndAnimationByToolBar = true
}
}
}

14
SKPhotoBrowser/extensions/UIImage+Rotation.swift
View File

@ -52,21 +52,21 @@ extension UIImage {
// Now we draw the underlying CGImage into a new context, applying the transform
// calculated above.
let ctx = CGBitmapContextCreate(nil, Int(self.size.width), Int(self.size.height),
CGImageGetBitsPerComponent(self.CGImage), 0,
CGImageGetColorSpace(self.CGImage),
CGImageGetBitmapInfo(self.CGImage).rawValue)
CGContextConcatCTM(ctx, transform)
CGImageGetBitsPerComponent(self.CGImage!), 0,
CGImageGetColorSpace(self.CGImage!)!,
CGImageGetBitmapInfo(self.CGImage!).rawValue)
CGContextConcatCTM(ctx!, transform)
switch self.imageOrientation {
case .Left, .LeftMirrored, .Right, .RightMirrored:
CGContextDrawImage(ctx, CGRect(x: 0, y: 0, width: size.height, height: size.width), self.CGImage)
CGContextDrawImage(ctx!, CGRect(x: 0, y: 0, width: size.height, height: size.width), self.CGImage!)
default:
CGContextDrawImage(ctx, CGRect(x: 0, y: 0, width: size.width, height: size.height), self.CGImage)
CGContextDrawImage(ctx!, CGRect(x: 0, y: 0, width: size.width, height: size.height), self.CGImage!)
}
// And now we just create a new UIImage from the drawing context
if let cgImage = CGBitmapContextCreateImage(ctx) {
if let cgImage = CGBitmapContextCreateImage(ctx!) {
return UIImage(CGImage: cgImage)
} else {
return self