react-native-rectangle-doc-scanner 0.9.0 → 0.10.0

package/dist/DocScanner.js

@@ -150,15 +150,30 @@ const DocScanner = ({ onCapture, overlayColor = '#e7a649', autoCapture = true, m
                 reportStage(step);
                 const { value: perimeter } = react_native_fast_opencv_1.OpenCV.invoke('arcLength', contour, true);
                 const approx = react_native_fast_opencv_1.OpenCV.createObject(react_native_fast_opencv_1.ObjectType.PointVector);
-                step = `contour_${i}_approxPolyDP`;
-                reportStage(step);
-                react_native_fast_opencv_1.OpenCV.invoke('approxPolyDP', contour, approx, 0.012 * perimeter, true);
-                step = `contour_${i}_toJS`;
-                reportStage(step);
-                const approxValue = react_native_fast_opencv_1.OpenCV.toJSValue(approx);
-                const approxArray = Array.isArray(approxValue?.array) ? approxValue.array : [];
-                if (__DEV__) {
-                    reportStage(`${step}_length_${approxArray.length}`);
+                let approxArray = [];
+                let epsilonBase = 0.01 * perimeter;
+                for (let attempt = 0; attempt < 5; attempt += 1) {
+                    const epsilon = epsilonBase * (1 + attempt * 0.5);
+                    step = `contour_${i}_approxPolyDP_attempt_${attempt}`;
+                    reportStage(step);
+                    react_native_fast_opencv_1.OpenCV.invoke('approxPolyDP', contour, approx, epsilon, true);
+                    step = `contour_${i}_toJS_attempt_${attempt}`;
+                    reportStage(step);
+                    const approxValue = react_native_fast_opencv_1.OpenCV.toJSValue(approx);
+                    const candidate = Array.isArray(approxValue?.array) ? approxValue.array : [];
+                    if (__DEV__) {
+                        console.log('[DocScanner] approx length', candidate.length, 'epsilon', epsilon);
+                    }
+                    if (candidate.length === 4) {
+                        approxArray = candidate;
+                        break;
+                    }
+                    if (approxArray.length === 0 || Math.abs(candidate.length - 4) < Math.abs(approxArray.length - 4)) {
+                        approxArray = candidate;
+                    }
+                }
+                if (approxArray.length !== 4) {
+                    continue;
                 }
                 if (approxArray.length !== 4) {
                     continue;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-rectangle-doc-scanner",
-  "version": "0.9.0",
+  "version": "0.10.0",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "repository": {

package/src/DocScanner.tsx

@@ -172,17 +172,36 @@ export const DocScanner: React.FC<Props> = ({
         const { value: perimeter } = OpenCV.invoke('arcLength', contour, true);
         const approx = OpenCV.createObject(ObjectType.PointVector);
 
-        step = `contour_${i}_approxPolyDP`;
-        reportStage(step);
-        OpenCV.invoke('approxPolyDP', contour, approx, 0.012 * perimeter, true);
-
-        step = `contour_${i}_toJS`;
-        reportStage(step);
-        const approxValue = OpenCV.toJSValue(approx);
-        const approxArray = Array.isArray(approxValue?.array) ? approxValue.array : [];
+        let approxArray: Array<{ x: number; y: number }> = [];
+        let epsilonBase = 0.01 * perimeter;
+
+        for (let attempt = 0; attempt < 5; attempt += 1) {
+          const epsilon = epsilonBase * (1 + attempt * 0.5);
+          step = `contour_${i}_approxPolyDP_attempt_${attempt}`;
+          reportStage(step);
+          OpenCV.invoke('approxPolyDP', contour, approx, epsilon, true);
+
+          step = `contour_${i}_toJS_attempt_${attempt}`;
+          reportStage(step);
+          const approxValue = OpenCV.toJSValue(approx);
+          const candidate = Array.isArray(approxValue?.array) ? approxValue.array : [];
+
+          if (__DEV__) {
+            console.log('[DocScanner] approx length', candidate.length, 'epsilon', epsilon);
+          }
+
+          if (candidate.length === 4) {
+            approxArray = candidate as Array<{ x: number; y: number }>;
+            break;
+          }
+
+          if (approxArray.length === 0 || Math.abs(candidate.length - 4) < Math.abs(approxArray.length - 4)) {
+            approxArray = candidate as Array<{ x: number; y: number }>;
+          }
+        }
 
-        if (__DEV__) {
-          reportStage(`${step}_length_${approxArray.length}`);
+        if (approxArray.length !== 4) {
+          continue;
         }
 
         if (approxArray.length !== 4) {