Fixed up zooming precision when restoring

Author: TimOliver

Objective-C/TOCropViewController/Views/TOCropView.m

@@ -20,8 +20,6 @@
 //  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.
 
-#include <math.h>
-
 #import "TOCropView.h"
 #import "TOCropOverlayView.h"
 #import "TOCropScrollView.h"
@@ -217,7 +215,7 @@ - (void)setup
     [self addSubview:self.foregroundContainerView];
 
     self.foregroundImageView = [[UIImageView alloc] initWithImage:self.image];
-    self.foregroundImageView.backgroundColor =  [UIColor colorWithWhite:1.0f alpha:1.0f];
+    self.foregroundImageView.backgroundColor = [UIColor colorWithWhite:1.0f alpha:1.0f];
     self.foregroundImageView.layer.minificationFilter = kCAFilterTrilinear;
     [self.foregroundContainerView addSubview:self.foregroundImageView];
 
@@ -322,8 +320,8 @@ - (void)layoutInitialImage
     //Set the crop box to the size we calculated and align in the middle of the screen
     CGRect frame = CGRectZero;
     frame.size = self.hasAspectRatio ? cropBoxSize : scaledSize;
-    frame.origin.x = bounds.origin.x + floorf((CGRectGetWidth(bounds) - frame.size.width) * 0.5f);
-    frame.origin.y = bounds.origin.y + floorf((CGRectGetHeight(bounds) - frame.size.height) * 0.5f);
+    frame.origin.x = floorf(bounds.origin.x + floorf((CGRectGetWidth(bounds) - frame.size.width) * 0.5f));
+    frame.origin.y = floorf(bounds.origin.y + floorf((CGRectGetHeight(bounds) - frame.size.height) * 0.5f));
     self.cropBoxFrame = frame;
 
     //set the fully zoomed out state initially
@@ -418,7 +416,9 @@ - (void)matchForegroundToBackground
         return;
 
     //We can't simply match the frames since if the images are rotated, the frame property becomes unusable
-    self.foregroundImageView.frame = [self.backgroundContainerView.superview convertRect:self.backgroundContainerView.frame toView:self.foregroundContainerView];
+    self.foregroundImageView.frame = [self.backgroundContainerView.superview
+                                      convertRect:self.backgroundContainerView.frame
+                                      toView:self.foregroundContainerView];
 }
 
 - (void)updateCropBoxFrameWithGesturePoint:(CGPoint)point
@@ -783,20 +783,23 @@ - (void)updateToImageCropFrame:(CGRect)imageCropframe
 
     // Zoom into the scroll view to the appropriate size
     self.scrollView.zoomScale = self.scrollView.minimumZoomScale * scale;
-    
+
+    CGSize contentSize = self.scrollView.contentSize;
+    self.scrollView.contentSize = CGSizeMake(floorf(contentSize.width), floorf(contentSize.height));
+
     // Work out the size and offset of the upscaled crop box
     CGRect frame = CGRectZero;
-    frame.size = (CGSize){scaledCropSize.width * scale, scaledCropSize.height * scale};
+    frame.size = (CGSize){floorf(scaledCropSize.width * scale), floorf(scaledCropSize.height * scale)};
 
     //set the crop box
     CGRect cropBoxFrame = CGRectZero;
     cropBoxFrame.size = frame.size;
-    cropBoxFrame.origin.x = CGRectGetMidX(bounds) - (frame.size.width * 0.5f);
-    cropBoxFrame.origin.y = CGRectGetMidY(bounds) - (frame.size.height * 0.5f);
+    cropBoxFrame.origin.x = floorf(CGRectGetMidX(bounds) - (frame.size.width * 0.5f));
+    cropBoxFrame.origin.y = floorf(CGRectGetMidY(bounds) - (frame.size.height * 0.5f));
     self.cropBoxFrame = cropBoxFrame;
 
-    frame.origin.x = (scaledOffset.x * scale) - self.scrollView.contentInset.left;
-    frame.origin.y = (scaledOffset.y * scale) - self.scrollView.contentInset.top;
+    frame.origin.x = ceilf((scaledOffset.x * scale) - self.scrollView.contentInset.left);
+    frame.origin.y = ceilf((scaledOffset.y * scale) - self.scrollView.contentInset.top);
     self.scrollView.contentOffset = frame.origin;
 }