react-native-rectangle-doc-scanner 7.9.0 → 7.11.0

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

@@ -24,12 +24,14 @@ import android.util.Size
 import android.view.Surface
 import android.view.TextureView
 import androidx.core.content.ContextCompat
+import androidx.exifinterface.media.ExifInterface
 import com.google.mlkit.vision.common.InputImage
 import com.google.mlkit.vision.objects.ObjectDetection
 import com.google.mlkit.vision.objects.defaults.ObjectDetectorOptions
 import org.opencv.core.Point
 import java.io.File
 import java.io.FileOutputStream
+import java.io.ByteArrayInputStream
 import java.util.concurrent.atomic.AtomicReference
 import java.util.concurrent.atomic.AtomicBoolean
 import kotlin.math.abs
@@ -131,6 +133,10 @@ class CameraController(
         closeSession()
     }
 
+    fun refreshTransform() {
+        configureTransform()
+    }
+
     fun capturePhoto(
         outputDirectory: File,
         onImageCaptured: (File) -> Unit,
@@ -475,10 +481,11 @@ class CameraController(
             val buffer = image.planes[0].buffer
             val bytes = ByteArray(buffer.remaining())
             buffer.get(bytes)
+            val exifRotation = readExifRotation(bytes)
             val bitmap = BitmapFactory.decodeByteArray(bytes, 0, bytes.size)
                 ?: throw IllegalStateException("Failed to decode JPEG")
 
-            val rotated = rotateAndMirror(bitmap, computeRotationDegrees(), useFrontCamera)
+            val rotated = rotateAndMirror(bitmap, exifRotation, useFrontCamera)
             val photoFile = File(pending.outputDirectory, "doc_scan_${System.currentTimeMillis()}.jpg")
             FileOutputStream(photoFile).use { out ->
                 rotated.compress(Bitmap.CompressFormat.JPEG, 95, out)
@@ -516,15 +523,12 @@ class CameraController(
 
     private fun computeRotationDegrees(): Int {
         val displayRotation = displayRotationDegrees()
-
-        // For back camera with sensor orientation 0 and display rotation 90 (portrait),
-        // we need 270 degree rotation to display correctly
+        val baseRotation = (sensorOrientation + displayRotation) % 360
         val rotation = if (useFrontCamera) {
-            (sensorOrientation + displayRotation) % 360
+            (360 - baseRotation) % 360
         } else {
-            (sensorOrientation - displayRotation + 360) % 360
+            baseRotation
         }
-
         Log.d(TAG, "[ROTATION] sensor=$sensorOrientation display=$displayRotation front=$useFrontCamera -> rotation=$rotation")
         return rotation
     }
@@ -545,47 +549,28 @@ class CameraController(
         val viewHeight = previewView.height.toFloat()
         val preview = previewSize ?: return
         if (viewWidth == 0f || viewHeight == 0f) return
-
-        val rotation = computeRotationDegrees()
-        Log.d(TAG, "[TRANSFORM] rotation=$rotation view=${viewWidth}x${viewHeight} preview=${preview.width}x${preview.height}")
+        val rotation = previewView.display?.rotation ?: Surface.ROTATION_0
+        val rotationDegrees = displayRotationDegrees()
+        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
-
-        // Match iOS behavior: use the full preview extent and scale to fill
-        if (rotation == 270 || rotation == 90) {
-            // After rotation, dimensions are swapped
-            val rotatedWidth = preview.height.toFloat()
-            val rotatedHeight = preview.width.toFloat()
-
-            Log.d(TAG, "[TRANSFORM] After rotation: ${rotatedWidth}x${rotatedHeight}")
-
-            // Calculate scale to completely fill the view (aspect fill - crop mode like iOS)
-            // This will crop the image but fill the entire screen
-            val scaleX = viewWidth / rotatedWidth
-            val scaleY = viewHeight / rotatedHeight
-            val scale = maxOf(scaleX, scaleY)
-
-            Log.d(TAG, "[TRANSFORM] scaleX=$scaleX scaleY=$scaleY finalScale=$scale")
-
-            // Apply rotation around center first
-            matrix.postRotate(rotation.toFloat(), centerX, centerY)
-
-            // Then scale to fill (will crop excess)
-            matrix.postScale(scale, scale, centerX, centerY)
-        } else {
-            // For 0 or 180 degree rotation
-            val scaleX = viewWidth / preview.width.toFloat()
-            val scaleY = viewHeight / preview.height.toFloat()
-            val scale = maxOf(scaleX, scaleY)
-
-            Log.d(TAG, "[TRANSFORM] scaleX=$scaleX scaleY=$scaleY finalScale=$scale")
-
-            if (rotation != 0) {
-                matrix.postRotate(rotation.toFloat(), centerX, centerY)
-            }
+        val viewRect = RectF(0f, 0f, viewWidth, viewHeight)
+        val bufferRect = RectF(0f, 0f, preview.height.toFloat(), preview.width.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(viewRect, bufferRect, Matrix.ScaleToFit.FILL)
+            val scale = max(
+                viewHeight / preview.height.toFloat(),
+                viewWidth / preview.width.toFloat()
+            )
             matrix.postScale(scale, scale, centerX, centerY)
+            val rotateDegrees = if (rotation == Surface.ROTATION_90) -90f else 90f
+            matrix.postRotate(rotateDegrees, centerX, centerY)
+        } else if (rotation == Surface.ROTATION_180) {
+            matrix.postRotate(180f, centerX, centerY)
         }
 
         previewView.setTransform(matrix)
@@ -649,22 +634,37 @@ class CameraController(
     private fun rotateAndMirror(bitmap: Bitmap, rotationDegrees: Int, mirror: Boolean): Bitmap {
         Log.d(TAG, "[ROTATE_MIRROR] rotationDegrees=$rotationDegrees mirror=$mirror bitmap=${bitmap.width}x${bitmap.height}")
 
-        // JPEG_ORIENTATION is already set, so the image should already be rotated correctly.
-        // We only need to apply mirror for front camera.
-        if (!mirror) {
-            // Back camera: no additional processing needed since JPEG_ORIENTATION handles rotation.
-            Log.d(TAG, "[ROTATE_MIRROR] Back camera: returning bitmap as-is (JPEG_ORIENTATION already applied)")
+        if (rotationDegrees == 0 && !mirror) {
+            Log.d(TAG, "[ROTATE_MIRROR] No rotation/mirror needed, returning bitmap as-is")
             return bitmap
         }
 
-        // Front camera: apply horizontal mirror
         val matrix = Matrix()
-        matrix.postScale(-1f, 1f, bitmap.width / 2f, bitmap.height / 2f)
-        Log.d(TAG, "[ROTATE_MIRROR] Front camera: applied horizontal mirror")
+        if (rotationDegrees != 0) {
+            matrix.postRotate(rotationDegrees.toFloat(), bitmap.width / 2f, bitmap.height / 2f)
+        }
+        if (mirror) {
+            matrix.postScale(-1f, 1f, bitmap.width / 2f, bitmap.height / 2f)
+        }
 
         return Bitmap.createBitmap(bitmap, 0, 0, bitmap.width, bitmap.height, matrix, true)
     }
 
+    private fun readExifRotation(bytes: ByteArray): Int {
+        return try {
+            val exif = ExifInterface(ByteArrayInputStream(bytes))
+            when (exif.getAttributeInt(ExifInterface.TAG_ORIENTATION, ExifInterface.ORIENTATION_NORMAL)) {
+                ExifInterface.ORIENTATION_ROTATE_90 -> 90
+                ExifInterface.ORIENTATION_ROTATE_180 -> 180
+                ExifInterface.ORIENTATION_ROTATE_270 -> 270
+                else -> 0
+            }
+        } catch (e: Exception) {
+            Log.w(TAG, "[CAMERA2] Failed to read EXIF rotation", e)
+            0
+        }
+    }
+
     private fun refineWithOpenCv(
         nv21: ByteArray,
         imageWidth: Int,

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

@@ -135,6 +135,7 @@ class DocumentScannerView(context: ThemedReactContext) : FrameLayout(context), L
         super.onLayout(changed, left, top, right, bottom)
         if (changed) {
             Log.d(TAG, "[LAYOUT] View size: ${right - left}x${bottom - top}, PreviewView: ${previewView.width}x${previewView.height}")
+            cameraController?.refreshTransform()
         }
     }
 

package/package.json

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