[BitmapUtils@cropAndResize()] Fix: Case result size not equal to targetSize

Author: guhungry

photomanipulator/src/androidTest/java/com/guhungry/photomanipulator/BitmapUtilsAndroidTest.kt

@@ -76,6 +76,20 @@ internal class BitmapUtilsAndroidTest {
         assertThat(background!!.getPixel(75 + 96, 145 + 70), equalTo(overlay!!.getPixel(96, 70)))
     }
 
+    /**
+     * Fix Issue For
+     * https://github.com/react-native-community/react-native-image-editor/issues/27
+     */
+    @Test
+    fun cropAndResize_when_bug_scaledown_should_have_correct_size() {
+        FileUtils.openBitmapInputStream(TestHelper.context(), TestHelper.drawableUri(R.drawable.issue27)).use {
+            output = BitmapUtils.cropAndResize(it, CGRect(0, 0, 2160, 3840), CGSize(16, 16), BitmapFactory.Options())
+
+            assertThat(output!!.width, equalTo(16))
+            assertThat(output!!.height, equalTo(16))
+        }
+    }
+
     @Test
     fun readImageDimensions_should_return_correct_dimension() {
         assertReadImageDimensions(R.drawable.background, 800, 530)

photomanipulator/src/androidTest/res/drawable/issue27.jpg

@@ -5,7 +5,6 @@ import com.guhungry.photomanipulator.factory.AndroidFactory
 import com.guhungry.photomanipulator.factory.AndroidConcreteFactory
 import java.io.IOException
 import java.io.InputStream
-import kotlin.math.floor
 
 object BitmapUtils {
     @JvmStatic
@@ -75,7 +74,7 @@ object BitmapUtils {
         // This uses scaling mode COVER
         // Where would the crop rect end up within the scaled bitmap?
         val crop = findCropPosition(cropSize, targetSize, outOptions.inSampleSize)
-        val scaleMatrix = findCropScale(cropSize, targetSize, outOptions.inSampleSize)
+        val scaleMatrix = findCropScale(crop, targetSize)
 
         return Bitmap.createBitmap(bitmap, crop.origin.x, crop.origin.y, crop.size.width, crop.size.height, scaleMatrix, true)
     }
@@ -105,18 +104,17 @@ object BitmapUtils {
 
         return CGRect(applyScale(newX, sampleSize), applyScale(newY, sampleSize), applyScale(newWidth, sampleSize), applyScale(newHeight, sampleSize))
     }
-    private fun applyScale(value: Float, sampleSize: Int) = floor(value / sampleSize).toInt()
+    private fun applyScale(value: Float, sampleSize: Int) = kotlin.math.floor(value / sampleSize).toInt()
 
-    private fun findCropScale(rect: CGRect, targetSize: CGSize, sampleSize: Int): Matrix {
+    private fun findCropScale(rect: CGRect, targetSize: CGSize): Matrix {
         val cropRectRatio = rect.size.ratio()
         val targetRatio = targetSize.ratio()
 
-        val scale = if (cropRectRatio > targetRatio) { // e.g. source is landscape, target is portrait
+        val cropScale = if (cropRectRatio > targetRatio) { // e.g. source is landscape, target is portrait
             targetSize.height / rect.size.height.toFloat()
         } else { // e.g. source is landscape, target is portrait
             targetSize.width / rect.size.width.toFloat()
         }
-        val cropScale = scale * sampleSize
         return Matrix().apply { setScale(cropScale, cropScale) }
     }