Update RSKImageCropper to version 1.2.1.

Author: jonatansberg

iphone/RSKImageCropper/RSKImageCropViewController+Protected.h

@@ -0,0 +1,49 @@
+//
+// RSKImageCropViewController+Protected.h
+//
+// Copyright (c) 2014-present Ruslan Skorb, http://ruslanskorb.com/
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+//
+
+/**
+ 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.
+ */
+- (void)cropImage;
+
+/**
+ Tells the delegate that the crop has been canceled.
+ */
+- (void)cancelCrop;
+
+/**
+ Resets the rotation angle, the position and the zoom scale of the original image to the default values.
+ 
+ @param animated Set this value to YES to animate the reset.
+ */
+- (void)reset:(BOOL)animated;
+
+@end

iphone/RSKImageCropper/RSKImageCropViewController.h

@@ -1,7 +1,7 @@
 //
 // RSKImageCropViewController.h
 //
-// Copyright (c) 2014 Ruslan Skorb, http://ruslanskorb.com/
+// Copyright (c) 2014-present Ruslan Skorb, http://ruslanskorb.com/
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal

iphone/RSKImageCropper/RSKImageCropViewController.m

@@ -1,7 +1,7 @@
 //
 // RSKImageCropViewController.m
 //
-// Copyright (c) 2014 Ruslan Skorb, http://ruslanskorb.com/
+// Copyright (c) 2014-present Ruslan Skorb, http://ruslanskorb.com/
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
@@ -45,8 +45,9 @@
 
 @interface RSKImageCropViewController () <UIGestureRecognizerDelegate>
 
-@property (strong, nonatomic) UIColor *originalNavigationControllerViewBackgroundColor;
 @property (assign, nonatomic) BOOL originalNavigationControllerNavigationBarHidden;
+@property (strong, nonatomic) UIImage *originalNavigationControllerNavigationBarShadowImage;
+@property (strong, nonatomic) UIColor *originalNavigationControllerViewBackgroundColor;
 @property (assign, nonatomic) BOOL originalStatusBarHidden;
 
 @property (strong, nonatomic) RSKImageScrollView *imageScrollView;
@@ -141,6 +142,9 @@ - (void)viewWillAppear:(BOOL)animated
 
     self.originalNavigationControllerNavigationBarHidden = self.navigationController.navigationBarHidden;
     [self.navigationController setNavigationBarHidden:YES animated:NO];
+    
+    self.originalNavigationControllerNavigationBarShadowImage = self.navigationController.navigationBar.shadowImage;
+    self.navigationController.navigationBar.shadowImage = nil;
 }
 
 - (void)viewDidAppear:(BOOL)animated
@@ -161,6 +165,7 @@ - (void)viewWillDisappear:(BOOL)animated
     }
 
     [self.navigationController setNavigationBarHidden:self.originalNavigationControllerNavigationBarHidden animated:animated];
+    self.navigationController.navigationBar.shadowImage = self.originalNavigationControllerNavigationBarShadowImage;
     self.navigationController.view.backgroundColor = self.originalNavigationControllerViewBackgroundColor;
 }
 
@@ -398,7 +403,7 @@ - (void)setOriginalImage:(UIImage *)originalImage
 {
     if (![_originalImage isEqual:originalImage]) {
         _originalImage = originalImage;
-        if (self.isViewLoaded) {
+        if (self.isViewLoaded && self.view.window) {
             [self displayImage];
         }
     }
@@ -468,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
@@ -672,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]) {
@@ -691,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]) {

iphone/RSKImageCropper/RSKImageCropper.h

@@ -1,7 +1,7 @@
 //
 // RSKImageCropper.h
 //
-// Copyright (c) 2014 Ruslan Skorb, http://ruslanskorb.com/
+// Copyright (c) 2014-present Ruslan Skorb, http://ruslanskorb.com/
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal

iphone/RSKImageCropper/RSKTouchView.h

@@ -1,7 +1,7 @@
 //
 // RSKTouchView.h
 //
-// Copyright (c) 2014 Ruslan Skorb, http://ruslanskorb.com/
+// Copyright (c) 2014-present Ruslan Skorb, http://ruslanskorb.com/
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal

iphone/RSKImageCropper/RSKTouchView.m

@@ -1,7 +1,7 @@
 //
 // RSKTouchView.m
 //
-// Copyright (c) 2014 Ruslan Skorb, http://ruslanskorb.com/
+// Copyright (c) 2014-present Ruslan Skorb, http://ruslanskorb.com/
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal

iphone/RSKImageCropper/UIImage+RSKImageCropper.h

@@ -1,7 +1,7 @@
 //
 // UIImage+RSKImageCropper.h
 //
-// Copyright (c) 2014 Ruslan Skorb, http://ruslanskorb.com/
+// Copyright (c) 2014-present Ruslan Skorb, http://ruslanskorb.com/
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal

iphone/RSKImageCropper/UIImage+RSKImageCropper.m

@@ -1,7 +1,7 @@
 //
 // UIImage+RSKImageCropper.m
 //
-// Copyright (c) 2014 Ruslan Skorb, http://ruslanskorb.com/
+// Copyright (c) 2014-present Ruslan Skorb, http://ruslanskorb.com/
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal