react-native-rectangle-doc-scanner 7.14.0 → 7.16.0

package/android/src/camera2/kotlin/com/reactnativerectangledocscanner/CameraController.kt

@@ -35,6 +35,7 @@ import java.io.ByteArrayInputStream
 import java.util.concurrent.atomic.AtomicReference
 import java.util.concurrent.atomic.AtomicBoolean
 import kotlin.math.abs
+import kotlin.math.max
 import kotlin.math.min
 
 class CameraController(
@@ -484,12 +485,7 @@ class CameraController(
             val bitmap = BitmapFactory.decodeByteArray(bytes, 0, bytes.size)
                 ?: throw IllegalStateException("Failed to decode JPEG")
 
-            val computedRotation = computeRotationDegrees()
-            val rotation = if (exifRotation == 0 || exifRotation != computedRotation) {
-                computedRotation
-            } else {
-                exifRotation
-            }
+            val rotation = if (exifRotation != 0) exifRotation else computeRotationDegrees()
             val rotated = rotateAndMirror(bitmap, rotation, useFrontCamera)
             val photoFile = File(pending.outputDirectory, "doc_scan_${System.currentTimeMillis()}.jpg")
             FileOutputStream(photoFile).use { out ->
@@ -558,17 +554,20 @@ class CameraController(
         Log.d(TAG, "[TRANSFORM] rotation=$rotationDegrees view=${viewWidth}x${viewHeight} preview=${preview.width}x${preview.height}")
 
         val matrix = Matrix()
-        val viewRect = RectF(0f, 0f, viewWidth, viewHeight)
-        val bufferRect = if (rotation == Surface.ROTATION_90 || rotation == Surface.ROTATION_270) {
-            RectF(0f, 0f, preview.height.toFloat(), preview.width.toFloat())
-        } else {
-            RectF(0f, 0f, preview.width.toFloat(), preview.height.toFloat())
-        }
-        val centerX = viewRect.centerX()
-        val centerY = viewRect.centerY()
+        val centerX = viewWidth / 2f
+        val centerY = viewHeight / 2f
+        val isSwapped = rotation == Surface.ROTATION_90 || rotation == Surface.ROTATION_270
+        val bufferWidth = if (isSwapped) preview.height.toFloat() else preview.width.toFloat()
+        val bufferHeight = if (isSwapped) preview.width.toFloat() else preview.height.toFloat()
+        val scale = max(viewWidth / bufferWidth, viewHeight / bufferHeight)
+        val scaledWidth = bufferWidth * scale
+        val scaledHeight = bufferHeight * scale
+        val dx = (viewWidth - scaledWidth) / 2f
+        val dy = (viewHeight - scaledHeight) / 2f
+
+        matrix.setScale(scale, scale)
+        matrix.postTranslate(dx, dy)
 
-        bufferRect.offset(centerX - bufferRect.centerX(), centerY - bufferRect.centerY())
-        matrix.setRectToRect(bufferRect, viewRect, Matrix.ScaleToFit.FILL)
         if (rotation != Surface.ROTATION_0) {
             val rotateDegrees = when (rotation) {
                 Surface.ROTATION_90 -> -90f

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-rectangle-doc-scanner",
-  "version": "7.14.0",
+  "version": "7.16.0",
   "description": "Native-backed document scanner for React Native with customizable overlays.",
   "license": "MIT",
   "main": "dist/index.js",