Support float for sample size

carousell · Sep 9, 2017 · bbdbf4e · bbdbf4e
1 parent d56ef18
commit bbdbf4e
Showing 1 changed file with 7 additions and 7 deletions.
diff --git a/cropimageview/src/main/java/com/thecarousell/cropimageview/CropImageView.java b/cropimageview/src/main/java/com/thecarousell/cropimageview/CropImageView.java
@@ -102,7 +102,7 @@ public class CropImageView extends FrameLayout {
     /**
      * The sample size the image was loaded by if was loaded by URI
      */
-    private int mLoadedSampleSize = 1;
+    private float mLoadedSampleSize = 1f;
 
     /**
      * The current zoom level to to scale the cropping image
@@ -518,8 +518,8 @@ public Rect getWholeImageRect() {
             return null;
         }
 
-        int orgWidth = mBitmap.getWidth() * mLoadedSampleSize;
-        int orgHeight = mBitmap.getHeight() * mLoadedSampleSize;
+        int orgWidth = (int) (mBitmap.getWidth() * mLoadedSampleSize);
+        int orgHeight = (int) (mBitmap.getHeight() * mLoadedSampleSize);
         return new Rect(0, 0, orgWidth, orgHeight);
     }
 
@@ -535,8 +535,8 @@ public Rect getCropRect() {
             // get the points of the crop rectangle adjusted to source bitmap
             float[] points = getCropPoints();
 
-            int orgWidth = mBitmap.getWidth() * mLoadedSampleSize;
-            int orgHeight = mBitmap.getHeight() * mLoadedSampleSize;
+            int orgWidth = (int) (mBitmap.getWidth() * mLoadedSampleSize);
+            int orgHeight = (int) (mBitmap.getHeight() * mLoadedSampleSize);
 
             // get the rectangle for the points (it may be larger than original if rotation is
             // not stright)
@@ -629,7 +629,7 @@ public void setImageBitmap(Bitmap bitmap) {
      * @param loadSampleSize the sample size of bitmap
      * @param degreesRotated the degrees bitmap should be rotated
      */
-    public void setImageBitmap(Bitmap bitmap, int loadSampleSize, int degreesRotated) {
+    public void setImageBitmap(Bitmap bitmap, float loadSampleSize, int degreesRotated) {
         mCropOverlayView.setInitialCropWindowRect(null);
         setBitmap(bitmap, loadSampleSize, degreesRotated);
     }
@@ -743,7 +743,7 @@ public void flipImageVertically() {
      * Optionally clear full if the bitmap is new, or partial clear if the bitmap has been
      * manipulated.
      */
-    private void setBitmap(Bitmap bitmap, int loadSampleSize, int degreesRotated) {
+    private void setBitmap(Bitmap bitmap, float loadSampleSize, int degreesRotated) {
         if (mBitmap == null || !mBitmap.equals(bitmap)) {
 
             mImageView.clearAnimation();