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

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

@@ -484,7 +484,12 @@ class CameraController(
             val bitmap = BitmapFactory.decodeByteArray(bytes, 0, bytes.size)
                 ?: throw IllegalStateException("Failed to decode JPEG")
 
-            val rotation = if (exifRotation != 0) exifRotation else computeRotationDegrees()
+            val computedRotation = computeRotationDegrees()
+            val rotation = if (exifRotation == 0 || exifRotation != computedRotation) {
+                computedRotation
+            } else {
+                exifRotation
+            }
             val rotated = rotateAndMirror(bitmap, rotation, useFrontCamera)
             val photoFile = File(pending.outputDirectory, "doc_scan_${System.currentTimeMillis()}.jpg")
             FileOutputStream(photoFile).use { out ->
@@ -554,20 +559,24 @@ class CameraController(
 
         val matrix = Matrix()
         val viewRect = RectF(0f, 0f, viewWidth, viewHeight)
-        val bufferRect = RectF(0f, 0f, preview.height.toFloat(), preview.width.toFloat())
+        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()
 
-        if (rotation == Surface.ROTATION_90 || rotation == Surface.ROTATION_270) {
-            bufferRect.offset(centerX - bufferRect.centerX(), centerY - bufferRect.centerY())
-            matrix.setRectToRect(bufferRect, viewRect, Matrix.ScaleToFit.CENTER)
-            val rotateDegrees = if (rotation == Surface.ROTATION_90) -90f else 90f
-            matrix.postRotate(rotateDegrees, centerX, centerY)
-        } else {
-            matrix.setRectToRect(bufferRect, viewRect, Matrix.ScaleToFit.CENTER)
-            if (rotation == Surface.ROTATION_180) {
-                matrix.postRotate(180f, centerX, centerY)
+        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
+                Surface.ROTATION_180 -> 180f
+                Surface.ROTATION_270 -> 90f
+                else -> 0f
             }
+            matrix.postRotate(rotateDegrees, centerX, centerY)
         }
 
         previewView.setTransform(matrix)

package/package.json

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