react-native-rectangle-doc-scanner 7.18.0 → 7.20.0

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

@@ -8,7 +8,6 @@ import android.graphics.BitmapFactory
 import android.graphics.Matrix
 import android.graphics.SurfaceTexture
 import android.graphics.Rect
-import android.graphics.RectF
 import android.graphics.ImageFormat
 import android.hardware.camera2.CameraCaptureSession
 import android.hardware.camera2.CameraCharacteristics
@@ -555,30 +554,25 @@ 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 = displayRotationDegrees()
+        val rotationDegrees = computeRotationDegrees()
         Log.d(TAG, "[TRANSFORM] rotation=$rotationDegrees view=${viewWidth}x${viewHeight} preview=${preview.width}x${preview.height}")
 
         val matrix = Matrix()
         val centerX = viewWidth / 2f
         val centerY = viewHeight / 2f
-        val isSwapped = rotation == Surface.ROTATION_90 || rotation == Surface.ROTATION_270
+        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 viewRect = RectF(0f, 0f, viewWidth, viewHeight)
-        val bufferRect = RectF(0f, 0f, bufferWidth, bufferHeight)
-
-        // Scale to fill while preserving aspect ratio; avoid double-scaling.
-        matrix.setRectToRect(bufferRect, viewRect, Matrix.ScaleToFit.FILL)
-
-        if (rotation != Surface.ROTATION_0) {
-            val rotateDegrees = when (rotation) {
-                Surface.ROTATION_90 -> -90f
-                Surface.ROTATION_180 -> 180f
-                Surface.ROTATION_270 -> 90f
-                else -> 0f
-            }
-            matrix.postRotate(rotateDegrees, centerX, centerY)
+        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)
+
+        if (rotationDegrees != 0) {
+            matrix.postRotate(rotationDegrees.toFloat(), centerX, centerY)
         }
 
         previewView.setTransform(matrix)

package/package.json

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