Merge pull request #60 from ruslanskorb/develop

Version 1.2.1
ruslanskorb · Jul 8, 2015 · 8ede6f2 · 8ede6f2
2 parents 1b6d921 + 831669a
commit 8ede6f2
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 8 deletions.
diff --git a/Example/RSKImageCropperExample/RSKImageCropperExample-Info.plist b/Example/RSKImageCropperExample/RSKImageCropperExample-Info.plist
@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.2.0</string>
+	<string>1.2.1</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>

diff --git a/RSKImageCropper.podspec b/RSKImageCropper.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = 'RSKImageCropper'
-  s.version      = '1.2.0'
+  s.version      = '1.2.1'
   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' }

diff --git a/RSKImageCropper/RSKImageCropViewController+Protected.h b/RSKImageCropper/RSKImageCropViewController+Protected.h
@@ -22,7 +22,12 @@
 // THE SOFTWARE.
 //
 
-@interface RSKImageCropViewController (Protected)
+/**
+ The methods in the RSKImageCropViewControllerProtectedMethods category
+ typically should only be called by subclasses which are implementing new
+ image crop view controllers. They may be overridden but must call super.
+ */
+@interface RSKImageCropViewController (RSKImageCropViewControllerProtectedMethods)
 
 /**
  Asynchronously crops the original image in accordance with the current settings and tells the delegate that the original image will be / has been cropped.

diff --git a/RSKImageCropper/RSKImageCropViewController.m b/RSKImageCropper/RSKImageCropViewController.m
@@ -473,7 +473,7 @@ - (void)handleRotation:(UIRotationGestureRecognizer *)gestureRecognizer
 
 - (BOOL)isPortraitInterfaceOrientation
 {
-    return CGRectGetHeight(self.view.frame) > CGRectGetWidth(self.view.frame);
+    return CGRectGetHeight(self.view.bounds) > CGRectGetWidth(self.view.bounds);
 }
 
 #pragma mark - Private
@@ -677,8 +677,8 @@ - (void)updateMaskRect
 {
     switch (self.cropMode) {
         case RSKImageCropModeCircle: {
-            CGFloat viewWidth = CGRectGetWidth(self.view.frame);
-            CGFloat viewHeight = CGRectGetHeight(self.view.frame);
+            CGFloat viewWidth = CGRectGetWidth(self.view.bounds);
+            CGFloat viewHeight = CGRectGetHeight(self.view.bounds);
 
             CGFloat diameter;
             if ([self isPortraitInterfaceOrientation]) {
@@ -696,8 +696,8 @@ - (void)updateMaskRect
             break;
         }
         case RSKImageCropModeSquare: {
-            CGFloat viewWidth = CGRectGetWidth(self.view.frame);
-            CGFloat viewHeight = CGRectGetHeight(self.view.frame);
+            CGFloat viewWidth = CGRectGetWidth(self.view.bounds);
+            CGFloat viewHeight = CGRectGetHeight(self.view.bounds);
 
             CGFloat length;
             if ([self isPortraitInterfaceOrientation]) {