react-native-rectangle-doc-scanner 7.63.0 → 7.65.0

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

@@ -669,79 +669,44 @@ class CameraController(
         val centerX = viewRect.centerX()
         val centerY = viewRect.centerY()
 
-        fun buildTransform(appliedRotation: Int): Pair<Matrix, FloatArray> {
-            val candidate = Matrix()
-            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())
-
-            candidate.setRectToRect(viewRect, bufferRect, Matrix.ScaleToFit.FILL)
-            val scale = max(viewWidth / bufferRect.width(), viewHeight / bufferRect.height())
-            candidate.postScale(scale, scale, centerX, centerY)
-            if (appliedRotation != 0) {
-                candidate.postRotate(appliedRotation.toFloat(), centerX, centerY)
-            }
-
-            val pts = floatArrayOf(
-                0f, 0f,
-                bufferWidth, 0f,
-                0f, bufferHeight,
-                bufferWidth, bufferHeight
-            )
-            candidate.mapPoints(pts)
-            return Pair(candidate, pts)
-        }
+        // Portrait-only mode: swap buffer dimensions based on sensor orientation
+        // sensorOrientation=90 means camera is rotated 90° from device natural orientation
+        val swap = sensorOrientation == 90 || sensorOrientation == 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())
 
-        fun scoreCoverage(pts: FloatArray): Float {
-            val minX = min(min(pts[0], pts[2]), min(pts[4], pts[6]))
-            val maxX = max(max(pts[0], pts[2]), max(pts[4], pts[6]))
-            val minY = min(min(pts[1], pts[3]), min(pts[5], pts[7]))
-            val maxY = max(max(pts[1], pts[3]), max(pts[5], pts[7]))
-
-            val left = max(viewRect.left, minX)
-            val top = max(viewRect.top, minY)
-            val right = min(viewRect.right, maxX)
-            val bottom = min(viewRect.bottom, maxY)
-            val intersection = if (right > left && bottom > top) (right - left) * (bottom - top) else 0f
-            val viewArea = viewRect.width() * viewRect.height()
-            return if (viewArea > 0f) intersection / viewArea else 0f
-        }
-
-        val positive = rotationDegrees
-        val negative = if (rotationDegrees == 0) 0 else (360 - rotationDegrees) % 360
-        val (matrixPos, ptsPos) = buildTransform(positive)
-        val (matrixNeg, ptsNeg) = buildTransform(negative)
-        val scorePos = scoreCoverage(ptsPos)
-        val scoreNeg = scoreCoverage(ptsNeg)
+        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)
+        // Portrait-only: no additional rotation needed, sensor orientation is already handled by buffer swap
 
-        val appliedRotation = if (scoreNeg > scorePos) negative else positive
-        val appliedMatrix = if (appliedRotation == positive) matrixPos else matrixNeg
-        val appliedPts = if (appliedRotation == positive) ptsPos else ptsNeg
+        val pts = floatArrayOf(
+            0f, 0f,
+            bufferWidth, 0f,
+            0f, bufferHeight,
+            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}"
+            "[TRANSFORM] sensor=$sensorOrientation display=$displayRotation swap=$swap " +
+                "view=${viewWidth}x${viewHeight} preview=${preview.width}x${preview.height} buffer=${bufferWidth}x${bufferHeight}"
         )
 
-        previewView.setTransform(appliedMatrix)
-        latestTransform = Matrix(appliedMatrix)
+        previewView.setTransform(matrix)
+        latestTransform = Matrix(matrix)
         latestBufferWidth = preview.width
         latestBufferHeight = preview.height
-        latestTransformRotation = appliedRotation
+        latestTransformRotation = 0  // Portrait-only mode, no rotation applied
 
         Log.d(
             TAG,
-            "[TRANSFORM] appliedRotation=$appliedRotation scores pos=$scorePos neg=$scoreNeg viewClass=${previewView.javaClass.name} " +
-                "isTextureView=${previewView is TextureView} matrix=$appliedMatrix " +
-                "pts=[${appliedPts[0]},${appliedPts[1]} ${appliedPts[2]},${appliedPts[3]} ${appliedPts[4]},${appliedPts[5]} ${appliedPts[6]},${appliedPts[7]}]"
+            "[TRANSFORM] scale=$scale matrix=$matrix"
         )
-        val recomputed = computeRotationDegrees()
-        if (rotationDegrees != recomputed) {
-            Log.e(TAG, "[TRANSFORM] rotation mismatch computed=$rotationDegrees recomputed=$recomputed")
-        }
         Log.d(TAG, "[TRANSFORM] Matrix applied successfully")
     }
 

package/package.json

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