react-native-rectangle-doc-scanner 7.5.0 → 7.7.0

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

@@ -150,6 +150,10 @@ class CameraController(
         }
 
         try {
+            // Use 90 degrees for back camera in portrait mode
+            val jpegOrientation = 90
+            Log.d(TAG, "[CAPTURE] Setting JPEG_ORIENTATION to $jpegOrientation")
+
             val requestBuilder = device.createCaptureRequest(CameraDevice.TEMPLATE_STILL_CAPTURE).apply {
                 addTarget(reader.surface)
                 set(CaptureRequest.CONTROL_AF_MODE, CaptureRequest.CONTROL_AF_MODE_CONTINUOUS_PICTURE)
@@ -157,7 +161,7 @@ class CameraController(
                 if (torchEnabled) {
                     set(CaptureRequest.FLASH_MODE, CaptureRequest.FLASH_MODE_TORCH)
                 }
-                set(CaptureRequest.JPEG_ORIENTATION, 0)
+                set(CaptureRequest.JPEG_ORIENTATION, jpegOrientation)
             }
 
             session.capture(requestBuilder.build(), object : CameraCaptureSession.CaptureCallback() {}, cameraHandler)
@@ -543,34 +547,48 @@ class CameraController(
         val rotation = computeRotationDegrees()
         Log.d(TAG, "[TRANSFORM] rotation=$rotation view=${viewWidth}x${viewHeight} preview=${preview.width}x${preview.height}")
 
-        // Calculate buffer dimensions after rotation
-        val bufferWidth = if (rotation == 90 || rotation == 270) preview.height.toFloat() else preview.width.toFloat()
-        val bufferHeight = if (rotation == 90 || rotation == 270) preview.width.toFloat() else preview.height.toFloat()
-
-        Log.d(TAG, "[TRANSFORM] buffer after rotation: ${bufferWidth}x${bufferHeight}")
-
+        val matrix = Matrix()
         val centerX = viewWidth / 2f
         val centerY = viewHeight / 2f
 
-        val matrix = Matrix()
-
-        // Apply rotation
-        if (rotation != 0) {
+        // For 270 degree rotation (portrait mode with back camera):
+        // - The camera sensor output is landscape (1920x1088)
+        // - We need to rotate 270 degrees to display it in portrait
+        // - Then scale to fill the entire view
+        if (rotation == 270 || rotation == 90) {
+            // Rotate first
             matrix.postRotate(rotation.toFloat(), centerX, centerY)
-        }
 
-        // Calculate scale to fill the view (crop mode)
-        val scaleX = viewWidth / bufferWidth
-        val scaleY = viewHeight / bufferHeight
-        val scale = maxOf(scaleX, scaleY)
+            // After rotation, the dimensions are swapped
+            val rotatedWidth = preview.height.toFloat()
+            val rotatedHeight = preview.width.toFloat()
 
-        Log.d(TAG, "[TRANSFORM] scaleX=$scaleX scaleY=$scaleY finalScale=$scale")
+            Log.d(TAG, "[TRANSFORM] After rotation: ${rotatedWidth}x${rotatedHeight}")
 
-        // Apply scale
-        matrix.postScale(scale, scale, centerX, centerY)
+            // Calculate scale to fill the view completely (aspect fill/crop mode)
+            val scaleX = viewWidth / rotatedWidth
+            val scaleY = viewHeight / rotatedHeight
+            val scale = maxOf(scaleX, scaleY)
 
-        previewView.setTransform(matrix)
+            Log.d(TAG, "[TRANSFORM] scaleX=$scaleX scaleY=$scaleY finalScale=$scale")
+
+            // Apply scale at center
+            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)
+            }
+            matrix.postScale(scale, scale, centerX, centerY)
+        }
+
+        previewView.setTransform(matrix)
         Log.d(TAG, "[TRANSFORM] Matrix applied successfully")
     }
 
@@ -630,27 +648,20 @@ 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}")
-        if (rotationDegrees == 0 && !mirror) {
-            return bitmap
-        }
-        val matrix = Matrix()
 
-        // For back camera, we need to mirror horizontally to fix the flip issue
-        // The camera sensor output is already mirrored, so we need to flip it back
+        // JPEG_ORIENTATION is already set to 90, so the image should already be rotated correctly
+        // We only need to apply mirror for front camera
         if (!mirror) {
-            // Back camera: flip horizontally
-            matrix.postScale(-1f, 1f, bitmap.width / 2f, bitmap.height / 2f)
-            Log.d(TAG, "[ROTATE_MIRROR] Applied horizontal flip for back camera")
-        } else {
-            // Front camera: keep mirror
-            matrix.postScale(-1f, 1f, bitmap.width / 2f, bitmap.height / 2f)
-            Log.d(TAG, "[ROTATE_MIRROR] Applied horizontal flip for front camera")
+            // Back camera: no additional processing needed since JPEG_ORIENTATION handles rotation
+            Log.d(TAG, "[ROTATE_MIRROR] Back camera: returning bitmap as-is (JPEG_ORIENTATION=90 already applied)")
+            return bitmap
         }
 
-        if (rotationDegrees != 0) {
-            matrix.postRotate(rotationDegrees.toFloat(), bitmap.width / 2f, bitmap.height / 2f)
-            Log.d(TAG, "[ROTATE_MIRROR] Applied rotation: $rotationDegrees degrees")
-        }
+        // 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")
+
         return Bitmap.createBitmap(bitmap, 0, 0, bitmap.width, bitmap.height, matrix, true)
     }
 

package/package.json

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