feat: update arcLength and approxPolyDP to accept PointVector typed contours/curves

Author: martinbooth

cpp/FOCV_Function.cpp

@@ -1154,16 +1154,36 @@ jsi::Object FOCV_Function::invoke(jsi::Runtime& runtime, const jsi::Value* argum
         cv::matchTemplate(*image, *templ, *result, method, *mask);
       } break;
       case hashString("approxPolyDP", 12): {
-        auto approxCurve = args.asMatPtr(2);
         auto epsilon = args.asNumber(3);
         auto closed = args.asBool(4);
-        
+
         if(args.isMat(1)) {
-          auto curve = args.asMatPtr(1);
-          cv::approxPolyDP(*curve, *approxCurve, epsilon, closed);
+            auto curve = args.asMatPtr(1);
+            if (args.isMat(2)) {
+                auto approxCurve = args.asMatPtr(2);
+                cv::approxPolyDP(*curve, *approxCurve, epsilon, closed);
+            } else {
+                auto approxCurve = args.asPointVectorPtr(2);
+                cv::approxPolyDP(*curve, *approxCurve, epsilon, closed);
+            }
+        } else if (args.isMatVector(1)) {
+            auto curve = args.asMatVectorPtr(1);
+            if (args.isMat(2)) {
+                auto approxCurve = args.asMatPtr(2);
+                cv::approxPolyDP(*curve, *approxCurve, epsilon, closed);
+            } else {
+                auto approxCurve = args.asPointVectorPtr(2);
+                cv::approxPolyDP(*curve, *approxCurve, epsilon, closed);
+            }
         } else {
-          auto curve = args.asMatVectorPtr(1);
-          cv::approxPolyDP(*curve, *approxCurve, epsilon, closed);
+            auto curve = args.asPointVectorPtr(1);
+            if (args.isMat(2)) {
+                auto approxCurve = args.asMatPtr(2);
+                cv::approxPolyDP(*curve, *approxCurve, epsilon, closed);
+            } else {
+                auto approxCurve = args.asPointVectorPtr(2);
+                cv::approxPolyDP(*curve, *approxCurve, epsilon, closed);
+            }
         }
       } break;
       case hashString("arcLength", 9): {
@@ -1173,10 +1193,14 @@ jsi::Object FOCV_Function::invoke(jsi::Runtime& runtime, const jsi::Value* argum
           auto curve = args.asMatPtr(1);
           auto result = cv::arcLength(*curve, closed);
           value.setProperty(runtime, "value", jsi::Value(result));
+        } else if(args.isMatVector(1)) {
+            auto curve = args.asMatVectorPtr(1);
+            auto result = cv::arcLength(*curve, closed);
+            value.setProperty(runtime, "value", jsi::Value(result));
         } else {
-          auto curve = args.asMatVectorPtr(1);
-          auto result = cv::arcLength(*curve, closed);
-          value.setProperty(runtime, "value", jsi::Value(result));
+            auto curve = args.asPointVectorPtr(1);
+            auto result = cv::arcLength(*curve, closed);
+            value.setProperty(runtime, "value", jsi::Value(result));
         }
       } break;
       case hashString("boundingRect", 12): {
@@ -1292,4 +1316,4 @@ jsi::Object FOCV_Function::invoke(jsi::Runtime& runtime, const jsi::Value* argum
   }
 
   return value;
-}
+}

docs/pages/availablefunctions.md

@@ -1971,7 +1971,7 @@ Approximates a polygonal curve(s) with the specified precision
 ```js
 invoke(
   name: 'approxPolyDP',
-  curve: Mat | MatVector,
+  curve: Mat | MatVector | PointVector,
   approxCurve: Mat,
   epsilon: number,
   closed: boolean
@@ -1987,7 +1987,7 @@ Calculates a contour perimeter or a curve length.
 ```js
 invoke(
   name: 'arcLength',
-  curve: Mat | MatVector,
+  curve: Mat | MatVector | PointVector,
   closed: boolean
 ): { value: number };
 ```

src/functions/ImageProcessing/Shape.ts

@@ -23,8 +23,8 @@ export type Shape = {
    */
   invoke(
     name: 'approxPolyDP',
-    curve: Mat | MatVector,
-    approxCurve: Mat,
+    curve: Mat | MatVector | PointVector,
+    approxCurve: Mat | PointVector,
     epsilon: number,
     closed: boolean
   ): void;
@@ -37,7 +37,7 @@ export type Shape = {
    */
   invoke(
     name: 'arcLength',
-    curve: Mat | MatVector,
+    curve: Mat | MatVector | PointVector,
     closed: boolean
   ): { value: number };