react-native-rectangle-doc-scanner 1.11.0 → 1.13.0

package/ios/RNRDocScannerView.swift

@@ -226,15 +226,23 @@ class RNRDocScannerView: UIView, AVCaptureVideoDataOutputSampleBufferDelegate, A
     let request = VNDetectRectanglesRequest(completionHandler: requestHandler)
 
       request.maximumObservations = 3
-      request.minimumConfidence = 0.55
-      request.minimumAspectRatio = 0.1
-      request.maximumAspectRatio = 2.0
+      request.minimumConfidence = 0.65
+      request.minimumAspectRatio = 0.12
+      request.maximumAspectRatio = 1.9
       request.minimumSize = 0.05
       if #available(iOS 13.0, *) {
-        request.quadratureTolerance = 20
+        request.quadratureTolerance = 18
       }
 
-    let handler = VNImageRequestHandler(cvPixelBuffer: pixelBuffer, orientation: orientation, options: [:])
+    var processedImage = CIImage(cvPixelBuffer: pixelBuffer)
+    processedImage = processedImage.applyingFilter("CIColorControls", parameters: [
+      kCIInputContrastKey: 1.35,
+      kCIInputBrightnessKey: 0.02,
+      kCIInputSaturationKey: 1.05,
+    ])
+    processedImage = processedImage.applyingFilter("CISharpenLuminance", parameters: [kCIInputSharpnessKey: 0.5])
+
+    let handler = VNImageRequestHandler(ciImage: processedImage, orientation: orientation, options: [:])
     do {
       try handler.perform([request])
     } catch {
@@ -282,12 +290,12 @@ class RNRDocScannerView: UIView, AVCaptureVideoDataOutputSampleBufferDelegate, A
       updateNativeOverlay(with: shouldDisplayOverlay ? observation : nil)
 
       payload = [
-        "rectangleCoordinates": [
+        "rectangleCoordinates": shouldDisplayOverlay ? [
           "topLeft": ["x": points[0].x, "y": points[0].y],
           "topRight": ["x": points[1].x, "y": points[1].y],
           "bottomRight": ["x": points[2].x, "y": points[2].y],
           "bottomLeft": ["x": points[3].x, "y": points[3].y],
-        ],
+        ] : NSNull(),
         "stableCounter": currentStableCounter,
         "frameWidth": frameSize.width,
         "frameHeight": frameSize.height,
@@ -339,7 +347,7 @@ class RNRDocScannerView: UIView, AVCaptureVideoDataOutputSampleBufferDelegate, A
       let points: [CGPoint]
       if let previous = self.smoothedOverlayPoints, previous.count == 4 {
         points = zip(previous, orderedPoints).map { prev, next in
-          CGPoint(x: prev.x * 0.85 + next.x * 0.15, y: prev.y * 0.85 + next.y * 0.15)
+          CGPoint(x: prev.x * 0.7 + next.x * 0.3, y: prev.y * 0.7 + next.y * 0.3)
         }
       } else {
         points = orderedPoints
@@ -389,17 +397,51 @@ class RNRDocScannerView: UIView, AVCaptureVideoDataOutputSampleBufferDelegate, A
   private func orderPoints(_ points: [CGPoint]) -> [CGPoint] {
     guard points.count == 4 else { return points }
 
-    let sortedByY = points.sorted { a, b in
-      if a.y == b.y {
-        return a.x < b.x
+    var topLeft = points[0]
+    var topRight = points[0]
+    var bottomRight = points[0]
+    var bottomLeft = points[0]
+
+    var minSum = CGFloat.greatestFiniteMagnitude
+    var maxSum = -CGFloat.greatestFiniteMagnitude
+    var minDiff = CGFloat.greatestFiniteMagnitude
+    var maxDiff = -CGFloat.greatestFiniteMagnitude
+
+    for point in points {
+      let sum = point.x + point.y
+      if sum < minSum {
+        minSum = sum
+        topLeft = point
+      }
+      if sum > maxSum {
+        maxSum = sum
+        bottomRight = point
+      }
+
+      let diff = point.x - point.y
+      if diff < minDiff {
+        minDiff = diff
+        bottomLeft = point
+      }
+      if diff > maxDiff {
+        maxDiff = diff
+        topRight = point
       }
-      return a.y < b.y
     }
 
-    let top = sortedByY.prefix(2).sorted { $0.x < $1.x }
-    let bottom = sortedByY.suffix(2).sorted { $0.x < $1.x }
+    var ordered = [topLeft, topRight, bottomRight, bottomLeft]
+    if cross(ordered[0], ordered[1], ordered[2]) < 0 {
+      ordered = [topLeft, bottomLeft, bottomRight, topRight]
+    }
+    return ordered
+  }
 
-    return [top[0], top[1], bottom[1], bottom[0]]
+  private func cross(_ a: CGPoint, _ b: CGPoint, _ c: CGPoint) -> CGFloat {
+    let abx = b.x - a.x
+    let aby = b.y - a.y
+    let acx = c.x - a.x
+    let acy = c.y - a.y
+    return abx * acy - aby * acx
   }
 
   // MARK: - Capture

package/package.json

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