react-native-rectangle-doc-scanner 7.62.0 → 7.64.0

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

@@ -355,11 +355,13 @@ class CameraController(
             captureSize = chooseBestSize(captureSizes, previewAspect, null, preferClosestAspect = true)
                 ?: captureSizes?.maxByOrNull { it.width * it.height }
 
-            val previewDiff = previewSize?.let { abs(it.width.toDouble() / it.height.toDouble() - targetPreviewAspect) }
+            val viewAspectNormalized = max(viewAspect, 1.0 / viewAspect)
+            val previewAspectNormalized = max(previewAspect, 1.0 / previewAspect)
+            val previewDiff = abs(previewAspectNormalized - viewAspectNormalized)
             Log.d(
                 TAG,
-                "[SIZE_SELECTION] targetAspect=$targetPreviewAspect viewAspect=$viewAspect " +
-                    "previewAspect=$previewAspect diff=$previewDiff selected=${previewSize?.width}x${previewSize?.height}"
+                "[SIZE_SELECTION] targetAspect=$viewAspectNormalized viewAspect=$viewAspectNormalized " +
+                    "previewAspect=$previewAspectNormalized diff=$previewDiff selected=${previewSize?.width}x${previewSize?.height}"
             )
 
             setupImageReaders()
@@ -662,35 +664,26 @@ class CameraController(
 
         val rotationDegrees = computeRotationDegrees()
         val displayRotation = displayRotationDegrees()
-        Log.d(
-            TAG,
-            "[TRANSFORM] rotations sensor=$sensorOrientation display=$displayRotation computed=$rotationDegrees view=${viewWidth}x${viewHeight} preview=${preview.width}x${preview.height}"
-        )
 
-        val matrix = Matrix()
         val viewRect = RectF(0f, 0f, viewWidth, viewHeight)
         val centerX = viewRect.centerX()
         val centerY = viewRect.centerY()
 
-        val isSwapped = rotationDegrees == 90 || rotationDegrees == 270
-        val bufferWidth = if (isSwapped) preview.height.toFloat() else preview.width.toFloat()
-        val bufferHeight = if (isSwapped) preview.width.toFloat() else preview.height.toFloat()
+        val appliedRotation = rotationDegrees
+        val swap = appliedRotation == 90 || appliedRotation == 270
+        val bufferWidth = if (swap) preview.height.toFloat() else preview.width.toFloat()
+        val bufferHeight = if (swap) preview.width.toFloat() else preview.height.toFloat()
         val bufferRect = RectF(0f, 0f, bufferWidth, bufferHeight)
         bufferRect.offset(centerX - bufferRect.centerX(), centerY - bufferRect.centerY())
 
+        val matrix = Matrix()
         matrix.setRectToRect(viewRect, bufferRect, Matrix.ScaleToFit.FILL)
         val scale = max(viewWidth / bufferRect.width(), viewHeight / bufferRect.height())
         matrix.postScale(scale, scale, centerX, centerY)
-        if (rotationDegrees != 0) {
-            matrix.postRotate(rotationDegrees.toFloat(), centerX, centerY)
+        if (appliedRotation != 0) {
+            matrix.postRotate(appliedRotation.toFloat(), centerX, centerY)
         }
 
-        previewView.setTransform(matrix)
-        latestTransform = Matrix(matrix)
-        latestBufferWidth = preview.width
-        latestBufferHeight = preview.height
-        latestTransformRotation = rotationDegrees
-
         val pts = floatArrayOf(
             0f, 0f,
             bufferWidth, 0f,
@@ -698,6 +691,19 @@ class CameraController(
             bufferWidth, bufferHeight
         )
         matrix.mapPoints(pts)
+
+        Log.d(
+            TAG,
+            "[TRANSFORM] rotations sensor=$sensorOrientation display=$displayRotation computed=$rotationDegrees applied=$appliedRotation " +
+                "view=${viewWidth}x${viewHeight} preview=${preview.width}x${preview.height}"
+        )
+
+        previewView.setTransform(matrix)
+        latestTransform = Matrix(matrix)
+        latestBufferWidth = preview.width
+        latestBufferHeight = preview.height
+        latestTransformRotation = appliedRotation
+
         Log.d(
             TAG,
             "[TRANSFORM] viewClass=${previewView.javaClass.name} isTextureView=${previewView is TextureView} " +
@@ -742,7 +748,9 @@ class CameraController(
         fun aspectDiff(size: Size): Double {
             val w = size.width.toDouble()
             val h = size.height.toDouble()
-            return abs(w / h - targetAspect)
+            val aspect = max(w, h) / min(w, h)
+            val target = max(targetAspect, 1.0 / targetAspect)
+            return abs(aspect - target)
         }
 
         if (preferClosestAspect) {

package/package.json

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