chore: minor library improvements

Author: lukaszkurantdev

cpp/FOCV_Function.cpp

@@ -1232,49 +1232,13 @@ jsi::Object FOCV_Function::invoke(jsi::Runtime& runtime, const jsi::Value* argum
 
         cv::threshold(*src, *dst, thresh, maxval, type);
       } break;
-      case hashString("calcOpticalFlowPyrLK", 20): {
-        auto prevImg = args.asMatPtr(1);
-        auto nextImg = args.asMatPtr(2);
-        auto prevPts = args.asMatPtr(3);
-        auto nextPts = args.asMatPtr(4);
-        auto status = args.asMatPtr(5);
-        auto err = args.asMatPtr(6);
-
-        if (count > 7) {
-          auto winSize = args.asSizePtr(7);
-          if (count > 8) {
-            auto maxLevel = args.asNumber(8);
-            if (count > 9) {
-              auto termCriteria = args.asTermCriteriaPtr(9);
-              if (count > 10) {
-                auto flags = args.asNumber(10);
-                if (count > 11) {
-                  auto minEigThreshold = args.asNumber(11);
-
-                  cv::calcOpticalFlowPyrLK(*prevImg, *nextImg, *prevPts, *nextPts, *status, *err, *winSize, maxLevel, *termCriteria, flags, minEigThreshold);
-                  break;
-                }
-                cv::calcOpticalFlowPyrLK(*prevImg, *nextImg, *prevPts, *nextPts, *status, *err, *winSize, maxLevel, *termCriteria, flags);
-                break;
-              }
-              cv::calcOpticalFlowPyrLK(*prevImg, *nextImg, *prevPts, *nextPts, *status, *err, *winSize, maxLevel, *termCriteria);
-              break;
-            }
-            cv::calcOpticalFlowPyrLK(*prevImg, *nextImg, *prevPts, *nextPts, *status, *err, *winSize, maxLevel);
-            break;
-          }
-          cv::calcOpticalFlowPyrLK(*prevImg, *nextImg, *prevPts, *nextPts, *status, *err, *winSize);
-          break;
-        }
-        cv::calcOpticalFlowPyrLK(*prevImg, *nextImg, *prevPts, *nextPts, *status, *err);
-      } break;
       case hashString("matchTemplate", 13): {
         auto image = args.asMatPtr(1);
         auto templ = args.asMatPtr(2);
         auto result = args.asMatPtr(3);
         auto method = args.asNumber(4);
         auto mask = args.asMatPtr(5);
-        
+
         cv::matchTemplate(*image, *templ, *result, method, *mask);
       } break;
       case hashString("phaseCorrelate", 14): {

cpp/FOCV_Storage.cpp

@@ -6,6 +6,7 @@
 //
 
 #include "FOCV_Storage.hpp"
+#include <set>
 
 std::unordered_map<std::string, std::any> FOCV_Storage::items = std::unordered_map<std::string, std::any>();
 
@@ -18,4 +19,4 @@ void FOCV_Storage::clear(const std::set<std::string> &ids_to_keep) {
       it = items.erase(it);
     }
   }
-}
+}

cpp/FOCV_Storage.hpp

@@ -10,6 +10,7 @@
 
 #include <stdio.h>
 #include <any>
+#include <set>
 #include "UUID.hpp"
 
 #ifdef __cplusplus

example/ios/Podfile.lock

@@ -936,7 +936,7 @@ PODS:
   - React-Mapbuffer (0.74.4):
     - glog
     - React-debug
-  - react-native-fast-opencv (0.3.3):
+  - react-native-fast-opencv (0.3.4):
     - DoubleConversion
     - FastOpenCV-iOS (= 1.0.4)
     - glog
@@ -1633,7 +1633,7 @@ SPEC CHECKSUMS:
   React-jsitracing: 4e9c99e73a6269b27b0d4cbab277dd90df3e5ac0
   React-logger: fbfb50e2a2b1b46ee087f0a52739fadecc5e81a4
   React-Mapbuffer: d39610dff659d8cf1fea485abae08bbf6f9c8279
-  react-native-fast-opencv: 973f3a99309db23b4ebded20de36757c790d1ec5
+  react-native-fast-opencv: 35b0442a0b585bc919de50a28344e5454c024b13
   react-native-image-picker: c3afe5472ef870d98a4b28415fc0b928161ee5f7
   react-native-safe-area-context: 4532f1a0c5d34a46b9324ccaaedcb5582a302b7d
   react-native-skia: e2b30a7cca22f5daef0ed243d18de58403e7a997

example/package.json

@@ -12,16 +12,16 @@
   "dependencies": {
     "@react-navigation/native": "^6.1.18",
     "@react-navigation/native-stack": "^6.11.0",
-    "@shopify/react-native-skia": "^1.3.10",
+    "@shopify/react-native-skia": "^1.8.2",
     "react": "18.2.0",
     "react-native": "0.74.4",
     "react-native-image-picker": "^7.1.2",
     "react-native-reanimated": "^3.14.0",
     "react-native-safe-area-context": "^4.11.0",
     "react-native-screens": "^3.34.0",
-    "react-native-vision-camera": "^4.5.2",
-    "react-native-worklets-core": "^1.3.3",
-    "vision-camera-resize-plugin": "^3.1.0"
+    "react-native-vision-camera": "4.6.3",
+    "react-native-worklets-core": "1.5.0",
+    "vision-camera-resize-plugin": "3.2.0"
   },
   "devDependencies": {
     "@babel/core": "^7.20.0",

src/functions/ImageProcessing/ObjectDetection.ts

@@ -1,42 +1,7 @@
-import type {
-  OpticalFlowFlags,
-  TemplateMatchModes,
-} from '../../constants/ImageProcessing';
-import type { Mat, Point2f, Size, TermCriteria } from '../../objects/Objects';
+import type { TemplateMatchModes } from '../../constants/ImageProcessing';
+import type { Mat, Point2f } from '../../objects/Objects';
 
 export type ObjectDetection = {
-  /**
-   * Calculates an optical flow for a sparse feature set using the iterative Lucas-Kanade method with pyramids.
-   * @param name Function name
-   * @param prevImg First 8-bit input image or pyramid constructed by buildOpticalFlowPyramid.
-   * @param nextImg Second input image or pyramid of the same size and the same type as prevImg.
-   * @param prevPts Vector of 2D points for which the flow needs to be found; point coordinates must be single-precision floating-point numbers.
-   * @param nextPts Output vector of 2D points (with single-precision floating-point coordinates) containing the calculated new positions of input features in the second image; when OPTFLOW_USE_INITIAL_FLOW flag is passed, the vector must have the same size as in the input.
-   * @param status Output status vector (of unsigned chars); each element of the vector is set to 1 if the flow for the corresponding features has been found, otherwise, it is set to 0.
-   * @param err Output vector of errors; each element of the vector is set to an error for the corresponding feature, type of the error measure can be set in flags parameter; if the flow wasn't found then the error is not defined (use the status parameter to find such cases).
-   * @param winSize Size of the search window at each pyramid level.
-   * @param maxLevel 0-based maximal pyramid level number; if set to 0, pyramids are not used (single level), if set to 1, two levels are used, and so on; if pyramids are passed to input then algorithm will use as many levels as pyramids have but no more than maxLevel.
-   * @param criteria Parameter, specifying the termination criteria of the iterative search algorithm (after the specified maximum number of iterations criteria.maxCount or when the search window moves by less than criteria.epsilon).
-   * @param flags Operation flags:
-   * * OPTFLOW_USE_INITIAL_FLOW uses initial estimations, stored in nextPts; if the flag is not set, then prevPts is copied to nextPts and is considered the initial estimate.
-   * * OPTFLOW_LK_GET_MIN_EIGENVALS use minimum eigen values as an error measure (see minEigThreshold description); if the flag is not set, then L1 distance between patches around the original and a moved point, divided by number of pixels in a window, is used as a error measure.
-   * @param minEigThreshold The algorithm calculates the minimum eigen value of a 2x2 normal matrix of optical flow equations (this matrix is called a spatial gradient matrix in [36]), divided by number of pixels in a window; if this value is less than minEigThreshold, then a corresponding feature is filtered out and its flow is not processed, so it allows to remove bad points and get a performance boost.
-   */
-  invoke(
-    name: 'calcOpticalFlowPyrLK',
-    prevImg: Mat,
-    nextImg: Mat,
-    prevPts: Mat,
-    nextPts: Mat,
-    status: Mat,
-    err: Mat,
-    winSize?: Size,
-    maxLevel?: number,
-    criteria?: TermCriteria,
-    flags?: OpticalFlowFlags,
-    minEigThreshold?: number
-  ): void;
-
   /**
    * Compares a template against overlapped image regions
    * @param name Function name

yarn.lock

@@ -3122,9 +3122,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@shopify/react-native-skia@npm:^1.3.10":
-  version: 1.5.5
-  resolution: "@shopify/react-native-skia@npm:1.5.5"
+"@shopify/react-native-skia@npm:^1.8.2":
+  version: 1.8.2
+  resolution: "@shopify/react-native-skia@npm:1.8.2"
   dependencies:
     canvaskit-wasm: "npm:0.39.1"
     react-reconciler: "npm:0.27.0"
@@ -3139,7 +3139,7 @@ __metadata:
       optional: true
   bin:
     setup-skia-web: ./scripts/setup-canvaskit.js
-  checksum: 10/63a87986131e20c93824c017502458718d516f735bf54784e700f491adb8e7e59ef15055022cdcd69dafea429778f38c3e4293365660b8ed80e9c069a7191158
+  checksum: 10/7bb95d28aebcbf8537228069ace8788823c72783eabe0c8c48b7e11afe5c44c19b819aeaac823d4240c7aab542d7eaa2a02f24b045067400fbc038fa65ba2cd5
   languageName: node
   linkType: hard
 
@@ -11109,17 +11109,17 @@ __metadata:
     "@react-native/typescript-config": "npm:0.74.86"
     "@react-navigation/native": "npm:^6.1.18"
     "@react-navigation/native-stack": "npm:^6.11.0"
-    "@shopify/react-native-skia": "npm:^1.3.10"
+    "@shopify/react-native-skia": "npm:^1.8.2"
     react: "npm:18.2.0"
     react-native: "npm:0.74.4"
     react-native-builder-bob: "npm:^0.29.0"
     react-native-image-picker: "npm:^7.1.2"
     react-native-reanimated: "npm:^3.14.0"
     react-native-safe-area-context: "npm:^4.11.0"
     react-native-screens: "npm:^3.34.0"
-    react-native-vision-camera: "npm:^4.5.2"
-    react-native-worklets-core: "npm:^1.3.3"
-    vision-camera-resize-plugin: "npm:^3.1.0"
+    react-native-vision-camera: "npm:4.6.3"
+    react-native-worklets-core: "npm:1.5.0"
+    vision-camera-resize-plugin: "npm:3.2.0"
   languageName: unknown
   linkType: soft
 
@@ -11210,9 +11210,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"react-native-vision-camera@npm:^4.5.2":
-  version: 4.6.1
-  resolution: "react-native-vision-camera@npm:4.6.1"
+"react-native-vision-camera@npm:4.6.3":
+  version: 4.6.3
+  resolution: "react-native-vision-camera@npm:4.6.3"
   peerDependencies:
     "@shopify/react-native-skia": "*"
     react: "*"
@@ -11226,11 +11226,11 @@ __metadata:
       optional: true
     react-native-worklets-core:
       optional: true
-  checksum: 10/742f11a74ca9e3eb3a41c65ba8ac588925b539d6e232f6a2c9c60b2ebcf07997d9a1bca0ef3ac471bf2b6d7eb99a81985a352a73755f8f0ee4aba1898c3b10d1
+  checksum: 10/ff56e8126df423ba5d4c9f8d2b15a1b9b48e8669445464b2f301fa47946ce1759e6e4119c443cb8f02a44f8ab5fd6c52a8d534cfc385fc9d647e857ee46f82e6
   languageName: node
   linkType: hard
 
-"react-native-worklets-core@npm:^1.3.3":
+"react-native-worklets-core@npm:1.5.0":
   version: 1.5.0
   resolution: "react-native-worklets-core@npm:1.5.0"
   dependencies:
@@ -13529,15 +13529,15 @@ __metadata:
   languageName: node
   linkType: hard
 
-"vision-camera-resize-plugin@npm:^3.1.0":
-  version: 3.1.0
-  resolution: "vision-camera-resize-plugin@npm:3.1.0"
+"vision-camera-resize-plugin@npm:3.2.0":
+  version: 3.2.0
+  resolution: "vision-camera-resize-plugin@npm:3.2.0"
   peerDependencies:
     react: "*"
     react-native: "*"
     react-native-vision-camera: ">=4.0.1"
     react-native-worklets-core: ">=1.2.0"
-  checksum: 10/68c64d0c133f76ff7332606b6ee9c78e0db99b0f095228293172beeee8206045c50c24e8e28e67f702138942d97d43690c2ce784561d1eb0d02a5a50fedba7b1
+  checksum: 10/39f06e35e0fb92e77815d97d7967aec84c4875c99128d7178f2784a9b0f2967e76fc7bb608768d18ee618a64ae899e0318d688c3c9f8556534876b295f008244
   languageName: node
   linkType: hard