Merge pull request #43 from ruslanskorb/develop

Version bump (1.1.1)
ruslanskorb · Mar 20, 2015 · f5c3810 · f5c3810
2 parents 577a9d5 + e6db256
commit f5c3810
Show file tree

Hide file tree

Showing 9 changed files with 76 additions and 8 deletions.
diff --git a/Example/RSKImageCropperExample.xcodeproj/project.pbxproj b/Example/RSKImageCropperExample.xcodeproj/project.pbxproj
@@ -9,6 +9,7 @@
 /* Begin PBXBuildFile section */
 		89BB37728461FC8C20D81A2B /* libPods-RSKImageCropperExampleTests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 74203A87984840A534E55F6C /* libPods-RSKImageCropperExampleTests.a */; };
 		B803F69E1AAB0A1F004141CF /* CGGeometry+RSKImageCropper.m in Sources */ = {isa = PBXBuildFile; fileRef = B803F69D1AAB0A1F004141CF /* CGGeometry+RSKImageCropper.m */; };
+		B8182F2E1ABC998B00601E43 /* LaunchScreen.xib in Resources */ = {isa = PBXBuildFile; fileRef = B8182F2D1ABC998B00601E43 /* LaunchScreen.xib */; };
 		B87A99F019A4D2CD00D12CD4 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B87A99EF19A4D2CD00D12CD4 /* Foundation.framework */; };
 		B87A99F219A4D2CD00D12CD4 /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B87A99F119A4D2CD00D12CD4 /* CoreGraphics.framework */; };
 		B87A99F419A4D2CD00D12CD4 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B87A99F319A4D2CD00D12CD4 /* UIKit.framework */; };
@@ -43,6 +44,7 @@
 		74203A87984840A534E55F6C /* libPods-RSKImageCropperExampleTests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-RSKImageCropperExampleTests.a"; sourceTree = BUILT_PRODUCTS_DIR; };
 		B803F69C1AAB0A1F004141CF /* CGGeometry+RSKImageCropper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "CGGeometry+RSKImageCropper.h"; sourceTree = "<group>"; };
 		B803F69D1AAB0A1F004141CF /* CGGeometry+RSKImageCropper.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "CGGeometry+RSKImageCropper.m"; sourceTree = "<group>"; };
+		B8182F2D1ABC998B00601E43 /* LaunchScreen.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = LaunchScreen.xib; sourceTree = "<group>"; };
 		B87A99EC19A4D2CD00D12CD4 /* RSKImageCropperExample.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = RSKImageCropperExample.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		B87A99EF19A4D2CD00D12CD4 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
 		B87A99F119A4D2CD00D12CD4 /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; };
@@ -139,6 +141,7 @@
 				B87A9A2119A4D31A00D12CD4 /* Controllers */,
 				B87A9A0119A4D2CD00D12CD4 /* Images.xcassets */,
 				B87A99F619A4D2CD00D12CD4 /* Supporting Files */,
+				B8182F2D1ABC998B00601E43 /* LaunchScreen.xib */,
 			);
 			name = Classes;
 			path = RSKImageCropperExample;
@@ -299,6 +302,7 @@
 			files = (
 				B87A99FA19A4D2CD00D12CD4 /* InfoPlist.strings in Resources */,
 				B87A9A0219A4D2CD00D12CD4 /* Images.xcassets in Resources */,
+				B8182F2E1ABC998B00601E43 /* LaunchScreen.xib in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};

diff --git a/Example/RSKImageCropperExample/Images.xcassets/AppIcon.appiconset/Contents.json b/Example/RSKImageCropperExample/Images.xcassets/AppIcon.appiconset/Contents.json
@@ -15,6 +15,11 @@
       "size" : "60x60",
       "scale" : "2x"
     },
+    {
+      "idiom" : "iphone",
+      "size" : "60x60",
+      "scale" : "3x"
+    },
     {
       "idiom" : "ipad",
       "size" : "29x29",

diff --git a/Example/RSKImageCropperExample/Images.xcassets/photo.imageset/Contents.json b/Example/RSKImageCropperExample/Images.xcassets/photo.imageset/Contents.json
@@ -8,6 +8,10 @@
     {
       "idiom" : "universal",
       "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
     }
   ],
   "info" : {

diff --git a/Example/RSKImageCropperExample/LaunchScreen.xib b/Example/RSKImageCropperExample/LaunchScreen.xib
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="6214" systemVersion="14A314h" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES">
+    <dependencies>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="6207"/>
+        <capability name="Constraints with non-1.0 multipliers" minToolsVersion="5.1"/>
+    </dependencies>
+    <objects>
+        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
+        <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
+        <view contentMode="scaleToFill" id="iN0-l3-epB">
+            <rect key="frame" x="0.0" y="0.0" width="480" height="480"/>
+            <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+            <subviews>
+                <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="  Copyright (c) 2015 Ruslan Skorb. All rights reserved." textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="9" translatesAutoresizingMaskIntoConstraints="NO" id="8ie-xW-0ye">
+                    <rect key="frame" x="20" y="439" width="441" height="21"/>
+                    <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                    <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
+                    <nil key="highlightedColor"/>
+                    <variation key="widthClass=compact">
+                        <fontDescription key="fontDescription" type="system" pointSize="11"/>
+                    </variation>
+                </label>
+                <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="RSKImageCropperExample" textAlignment="center" lineBreakMode="middleTruncation" baselineAdjustment="alignBaselines" minimumFontSize="18" translatesAutoresizingMaskIntoConstraints="NO" id="kId-c2-rCX">
+                    <rect key="frame" x="20" y="140" width="441" height="43"/>
+                    <fontDescription key="fontDescription" type="boldSystem" pointSize="36"/>
+                    <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
+                    <nil key="highlightedColor"/>
+                </label>
+            </subviews>
+            <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
+            <constraints>
+                <constraint firstItem="kId-c2-rCX" firstAttribute="centerY" secondItem="iN0-l3-epB" secondAttribute="bottom" multiplier="1/3" constant="1" id="Kid-kn-2rF"/>
+                <constraint firstAttribute="centerX" secondItem="kId-c2-rCX" secondAttribute="centerX" id="Koa-jz-hwk"/>
+                <constraint firstAttribute="bottom" secondItem="8ie-xW-0ye" secondAttribute="bottom" constant="20" id="Kzo-t9-V3l"/>
+                <constraint firstItem="8ie-xW-0ye" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" constant="20" symbolic="YES" id="MfP-vx-nX0"/>
+                <constraint firstAttribute="centerX" secondItem="8ie-xW-0ye" secondAttribute="centerX" id="ZEH-qu-HZ9"/>
+                <constraint firstItem="kId-c2-rCX" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" constant="20" symbolic="YES" id="fvb-Df-36g"/>
+            </constraints>
+            <nil key="simulatedStatusBarMetrics"/>
+            <freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
+            <point key="canvasLocation" x="404" y="445"/>
+        </view>
+    </objects>
+</document>
diff --git a/Example/RSKImageCropperExample/RSKImageCropperExample-Info.plist b/Example/RSKImageCropperExample/RSKImageCropperExample-Info.plist
@@ -17,13 +17,15 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.1.0</string>
+	<string>1.1.1</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
 	<string>1</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
+	<key>UILaunchStoryboardName</key>
+	<string>LaunchScreen</string>
 	<key>UIRequiredDeviceCapabilities</key>
 	<array>
 		<string>armv7</string>

diff --git a/README.md b/README.md
@@ -133,7 +133,8 @@ Then implement the data source functions.
 // Returns a custom rect in which the image can be moved.
 - (CGRect)imageCropViewControllerCustomMovementRect:(RSKImageCropViewController *)controller
 {
-    return [self imageCropViewControllerCustomMaskRect:controller];
+    // If the image is not rotated, then the movement rect coincides with the mask rect.
+    return controller.maskRect;
 }
 ```
 

diff --git a/RSKImageCropper.podspec b/RSKImageCropper.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = 'RSKImageCropper'
-  s.version      = '1.1.0'
+  s.version      = '1.1.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/CGGeometry+RSKImageCropper.h b/RSKImageCropper/CGGeometry+RSKImageCropper.h
@@ -49,6 +49,9 @@ __tg_promote2((__x), (__y))(__y))
 #undef fabs
 #define fabs(__x) __tg_fabs(__tg_promote1((__x))(__x))
 
+#undef ceil
+#define ceil(__x) __tg_ceil(__tg_promote1((__x))(__x))
+
 #ifdef CGFLOAT_IS_DOUBLE
     #define RSK_EPSILON DBL_EPSILON
 #else

diff --git a/RSKImageCropper/RSKImageCropViewController.m b/RSKImageCropper/RSKImageCropViewController.m
@@ -752,13 +752,17 @@ - (UIImage *)croppedImage:(UIImage *)image cropMode:(RSKImageCropMode)cropMode c
         cropRect.origin.y = round(imageSize.height - CGRectGetHeight(cropRect) - y);
     }
 
+    CGFloat imageScale = image.scale;
+    cropRect = CGRectApplyAffineTransform(cropRect, CGAffineTransformMakeScale(imageScale, imageScale));
+
     // Step 2: create an image using the data contained within the specified rect.
     CGImageRef croppedCGImage = CGImageCreateWithImageInRect(image.CGImage, cropRect);
-    UIImage *croppedImage = [UIImage imageWithCGImage:croppedCGImage scale:1.0f orientation:imageOrientation];
+    UIImage *croppedImage = [UIImage imageWithCGImage:croppedCGImage scale:imageScale orientation:imageOrientation];
     CGImageRelease(croppedCGImage);
 
     // Step 3: fix orientation of the cropped image.
     croppedImage = [croppedImage fixOrientation];
+    imageOrientation = croppedImage.imageOrientation;
 
     // Step 4: If current mode is `RSKImageCropModeSquare` and the image is not rotated
     // or mask should not be applied to the image after cropping and the image is not rotated,
@@ -770,16 +774,17 @@ - (UIImage *)croppedImage:(UIImage *)image cropMode:(RSKImageCropMode)cropMode c
     } else {
         // Step 5: create a new context.
         CGSize maskSize = CGRectIntegral(maskPath.bounds).size;
-        CGSize contextSize = CGSizeMake(maskSize.width / zoomScale, maskSize.height / zoomScale);
-        UIGraphicsBeginImageContext(contextSize);
+        CGSize contextSize = CGSizeMake(ceil(maskSize.width / zoomScale),
+                                        ceil(maskSize.height / zoomScale));
+        UIGraphicsBeginImageContextWithOptions(contextSize, NO, imageScale);
 
         // Step 6: apply the mask if needed.
         if (applyMaskToCroppedImage) {
             // 6a: scale the mask to the size of the crop rect.
             UIBezierPath *maskPathCopy = [maskPath copy];
             CGFloat scale = 1 / zoomScale;
             [maskPathCopy applyTransform:CGAffineTransformMakeScale(scale, scale)];
-
+            
             // 6b: move the mask to the top-left.
             CGPoint translation = CGPointMake(-CGRectGetMinX(maskPathCopy.bounds),
                                               -CGRectGetMinY(maskPathCopy.bounds));
@@ -805,7 +810,7 @@ - (UIImage *)croppedImage:(UIImage *)image cropMode:(RSKImageCropMode)cropMode c
         // Step 10: remove the context.
         UIGraphicsEndImageContext();
 
-        croppedImage = [UIImage imageWithCGImage:croppedImage.CGImage];
+        croppedImage = [UIImage imageWithCGImage:croppedImage.CGImage scale:imageScale orientation:imageOrientation];
 
         // Step 11: return the cropped image affter processing.
         return croppedImage;