Merge pull request #123 from ruslanskorb/develop

Version 1.5.2

Example/RSKImageCropperExample/RSKImageCropperExample-Info.plist

@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.5.1</string>
+	<string>1.5.2</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>

Framework/Info.plist

@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.5.1</string>
+	<string>1.5.2</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>

RSKImageCropper.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name          = 'RSKImageCropper'
-  s.version       = '1.5.1'
+  s.version       = '1.5.2'
   s.summary       = 'An image cropper for iOS like in the Contacts app with support for landscape orientation.'
   s.homepage      = 'https://github.com/ruslanskorb/RSKImageCropper'
   s.license       = { :type => 'MIT', :file => 'LICENSE' }

RSKImageCropper.xcodeproj/project.pbxproj

@@ -228,7 +228,7 @@
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 1.5.1;
+				CURRENT_PROJECT_VERSION = 1.5.2;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				ENABLE_TESTABILITY = YES;
@@ -278,7 +278,7 @@
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 1.5.1;
+				CURRENT_PROJECT_VERSION = 1.5.2;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				ENABLE_NS_ASSERTIONS = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
@@ -305,8 +305,8 @@
 			buildSettings = {
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
 				DEFINES_MODULE = YES;
-				DYLIB_COMPATIBILITY_VERSION = 1.5.1;
-				DYLIB_CURRENT_VERSION = 1.5.1;
+				DYLIB_COMPATIBILITY_VERSION = 1.5.2;
+				DYLIB_CURRENT_VERSION = 1.5.2;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
 				INFOPLIST_FILE = Framework/Info.plist;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
@@ -322,8 +322,8 @@
 			buildSettings = {
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
 				DEFINES_MODULE = YES;
-				DYLIB_COMPATIBILITY_VERSION = 1.5.1;
-				DYLIB_CURRENT_VERSION = 1.5.1;
+				DYLIB_COMPATIBILITY_VERSION = 1.5.2;
+				DYLIB_CURRENT_VERSION = 1.5.2;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
 				INFOPLIST_FILE = Framework/Info.plist;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";

RSKImageCropper/UIImage+RSKImageCropper.m

@@ -110,29 +110,33 @@ - (UIImage *)fixOrientation
 
 - (UIImage *)rotateByAngle:(CGFloat)angleInRadians
 {
-    // calculate the size of the rotated view's containing box for our drawing space
-    UIView *rotatedViewBox = [[UIView alloc] initWithFrame:CGRectMake(0,0,self.size.width, self.size.height)];
-    CGAffineTransform t = CGAffineTransformMakeRotation(angleInRadians);
-    rotatedViewBox.transform = t;
-    CGSize rotatedSize = rotatedViewBox.frame.size;
+    // Calculate the size of the rotated image.
+    UIView *rotatedView = [[UIView alloc] initWithFrame:CGRectMake(0.0, 0.0, self.size.width, self.size.height)];
+    rotatedView.transform = CGAffineTransformMakeRotation(angleInRadians);
+    CGSize rotatedViewSize = rotatedView.frame.size;
 
-    // Create the bitmap context
-    UIGraphicsBeginImageContextWithOptions(rotatedSize, NO, self.scale);
-    CGContextRef bitmap = UIGraphicsGetCurrentContext();
+    // Create a bitmap-based graphics context.
+    UIGraphicsBeginImageContextWithOptions(rotatedViewSize, NO, self.scale);
 
-    // Move the origin to the middle of the image so we will rotate and scale around the center.
-    CGContextTranslateCTM(bitmap, rotatedSize.width/2, rotatedSize.height/2);
+    CGContextRef context = UIGraphicsGetCurrentContext();
 
-    // Rotate the image context
-    CGContextRotateCTM(bitmap, angleInRadians);
+    // Move the origin of the user coordinate system in the context to the middle.
+    CGContextTranslateCTM(context, rotatedViewSize.width / 2, rotatedViewSize.height / 2);
 
-    // Now, draw the rotated/scaled image into the context
-    CGContextScaleCTM(bitmap, 1.0, -1.0);
-    CGContextDrawImage(bitmap, CGRectMake(-self.size.width / 2, -self.size.height / 2, self.size.width, self.size.height), [self CGImage]);
+    // Rotates the user coordinate system in the context.
+    CGContextRotateCTM(context, angleInRadians);
+
+    // Flip the handedness of the user coordinate system in the context.
+    CGContextScaleCTM(context, 1.0, -1.0);
+
+    // Draw the image into the context.
+    CGContextDrawImage(context, CGRectMake(-self.size.width / 2, -self.size.height / 2, self.size.width, self.size.height), self.CGImage);
+
+    UIImage *rotatedImage = UIGraphicsGetImageFromCurrentImageContext();
 
-    UIImage *newImage = UIGraphicsGetImageFromCurrentImageContext();
     UIGraphicsEndImageContext();
-    return newImage;
+
+    return rotatedImage;
 }
 
 @end