update to android studio 2.0

ArthurHub · Apr 9, 2016 · 4b34389 · 4b34389
1 parent 9dcb78b
commit 4b34389
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 6 deletions.
diff --git a/README.md b/README.md
@@ -73,8 +73,11 @@ For more information, see the [linked Github Wiki page](https://github.com/Arthu
  - [Android Image Cropper async support and custom progress UI](http://theartofdev.com/2016/01/15/android-image-cropper-async-support-and-custom-progress-ui/)
 
 ## Change log
+*1.2.5*
+ * Fix off-by-1 error in cropping rectangle, double verify width == height for 1:1 fixed aspect ratio.
+
 *1.2.4*
- * add fallback in crop to use `BitmapFactory` when `BitmapRegionDecoder` fails
+ * Added fallback in crop to use `BitmapFactory` when `BitmapRegionDecoder` fails
 
 *1.2.3*
  * Fix `getActualCropRect` to adjust by sampling size for images loaded from URI.

diff --git a/cropper/build.gradle b/cropper/build.gradle
@@ -6,7 +6,7 @@ apply plugin: 'maven-publish'
 ext {
     PUBLISH_GROUP_ID = 'com.theartofdev.edmodo'
     PUBLISH_ARTIFACT_ID = 'android-image-cropper'
-    PUBLISH_VERSION = '1.2.4'
+    PUBLISH_VERSION = '1.2.5'
     // gradlew clean build generateRelease
 }
 

diff --git a/cropper/src/main/java/com/theartofdev/edmodo/cropper/CropImageView.java b/cropper/src/main/java/com/theartofdev/edmodo/cropper/CropImageView.java
@@ -392,10 +392,21 @@ public Rect getActualCropRect() {
             float actualCropBottom = actualCropTop + displayedCropHeight * scaleFactor.second;
 
             // Correct for floating point errors. Crop rect boundaries should not exceed the source Bitmap bounds.
-            actualCropLeft = Math.max(0f, actualCropLeft) * mLoadedSampleSize;
-            actualCropTop = Math.max(0f, actualCropTop) * mLoadedSampleSize;
-            actualCropRight = Math.min(mBitmap.getWidth(), actualCropRight) * mLoadedSampleSize;
-            actualCropBottom = Math.min(mBitmap.getHeight(), actualCropBottom) * mLoadedSampleSize;
+            actualCropLeft = Math.round(Math.max(0f, actualCropLeft) * mLoadedSampleSize);
+            actualCropTop = Math.round(Math.max(0f, actualCropTop) * mLoadedSampleSize);
+            actualCropRight = Math.round(Math.min(mBitmap.getWidth(), actualCropRight) * mLoadedSampleSize);
+            actualCropBottom = Math.round(Math.min(mBitmap.getHeight(), actualCropBottom) * mLoadedSampleSize);
+
+            // extra cehck to be sure that width and height are equal if 1:1 fixed aspect ratio is requested
+            if (mCropOverlayView.isFixAspectRatio()
+                    && mCropOverlayView.getAspectRatioX() == mCropOverlayView.getAspectRatioY()
+                    && actualCropBottom - actualCropTop != actualCropRight - actualCropLeft) {
+                if (actualCropBottom - actualCropTop > actualCropRight - actualCropLeft) {
+                    actualCropBottom--;
+                } else {
+                    actualCropRight--;
+                }
+            }
 
             return new Rect((int) actualCropLeft, (int) actualCropTop, (int) actualCropRight, (int) actualCropBottom);
         } else {