react-native-rectangle-doc-scanner 7.38.0 → 7.40.0

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

@@ -559,29 +559,43 @@ class CameraController(
         val viewHeight = previewView.height.toFloat()
         val preview = previewSize ?: return
         if (viewWidth == 0f || viewHeight == 0f) return
+
         val rotation = previewView.display?.rotation ?: Surface.ROTATION_0
+        val rotationDegrees = when (rotation) {
+            Surface.ROTATION_0 -> 0
+            Surface.ROTATION_90 -> 90
+            Surface.ROTATION_180 -> 180
+            Surface.ROTATION_270 -> 270
+            else -> 0
+        }
         Log.d(
             TAG,
-            "[TRANSFORM] rotation=${displayRotationDegrees()} view=${viewWidth}x${viewHeight} preview=${preview.width}x${preview.height}"
+            "[TRANSFORM] rotation=$rotationDegrees view=${viewWidth}x${viewHeight} preview=${preview.width}x${preview.height}"
         )
 
-        val rotationDegrees = displayRotationDegrees()
-        val bufferWidth = preview.width.toFloat()
-        val bufferHeight = preview.height.toFloat()
-        val isSwapped = rotationDegrees == 90 || rotationDegrees == 270
-        val rotatedWidth = if (isSwapped) bufferHeight else bufferWidth
-        val rotatedHeight = if (isSwapped) bufferWidth else bufferHeight
-        val scale = max(viewWidth / rotatedWidth, viewHeight / rotatedHeight)
-        val rotateDegrees = -rotationDegrees.toFloat()
-
-        // Rotate around buffer center, then scale uniformly and center in the view (aspect-fill).
         val matrix = Matrix()
-        matrix.postTranslate(-bufferWidth / 2f, -bufferHeight / 2f)
-        if (rotateDegrees != 0f) {
-            matrix.postRotate(rotateDegrees)
+        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()
+
+        bufferRect.offset(centerX - bufferRect.centerX(), centerY - bufferRect.centerY())
+        matrix.setRectToRect(viewRect, bufferRect, Matrix.ScaleToFit.FILL)
+        val scale = max(viewWidth / bufferRect.width(), viewHeight / bufferRect.height())
+        matrix.postScale(scale, scale, centerX, centerY)
+
+        when (rotation) {
+            Surface.ROTATION_90, Surface.ROTATION_270 -> {
+                matrix.postRotate(90f * (rotation - 2), centerX, centerY)
+            }
+            Surface.ROTATION_180 -> {
+                matrix.postRotate(180f, centerX, centerY)
+            }
         }
-        matrix.postScale(scale, scale)
-        matrix.postTranslate(viewWidth / 2f, viewHeight / 2f)
 
         previewView.setTransform(matrix)
         Log.d(TAG, "[TRANSFORM] Matrix applied successfully")

package/package.json

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