Add object to vector

.gitignore

@@ -80,4 +80,5 @@ lib/
 .yarn/cache/*
 docs/.yarn
 .next
-docs/out/*
+docs/out/*
+.kotlin/

cpp/FOCV_Function.cpp

@@ -93,17 +93,48 @@ jsi::Object FOCV_Function::invoke(jsi::Runtime& runtime, const jsi::Value* argum
         cv::batchDistance(*src1, *src2, *dist, dtype, *nidx, normType, K, *mask, update, crosscheck);
       } break;
       case hashString("bitwise_and", 11): {
-        auto src1 = args.asMatPtr(1);
-        auto src2 = args.asMatPtr(2);
         auto dst = args.asMatPtr(3);
 
-        if (count > 4) {
-          auto mask = args.asMatPtr(4);
+        if (args.isMat(1)) {
+          auto src1 = args.asMatPtr(1);
 
-          cv::bitwise_and(*src1, *src2, *dst, *mask);
-          break;
+          if(args.isScalar(2)) {
+            auto src2 = args.asScalarPtr(2);
+            cv::bitwise_and(*src1, *src2, *dst);
+
+            if (count > 4) {
+              auto mask = args.asMatPtr(4);
+
+              cv::bitwise_and(*src1, *src2, *dst, *mask);
+              break;
+            }
+
+          } else {
+            auto src2 = args.asMatPtr(2);
+
+            if (count > 4) {
+              auto mask = args.asMatPtr(4);
+
+              cv::bitwise_and(*src1, *src2, *dst, *mask);
+              break;
+            }
+
+            cv::bitwise_and(*src1, *src2, *dst);
+          }
+        } else {
+          auto src1 = args.asScalarPtr(1);
+          auto src2 = args.asMatPtr(2);
+
+
+          if (count > 4) {
+            auto mask = args.asMatPtr(4);
+
+            cv::bitwise_and(*src1, *src2, *dst, *mask);
+            break;
+          }
+
+          cv::bitwise_and(*src1, *src2, *dst);
         }
-        cv::bitwise_and(*src1, *src2, *dst);
       } break;
       case hashString("bitwise_not", 11): {
         auto src = args.asMatPtr(1);
@@ -118,30 +149,90 @@ jsi::Object FOCV_Function::invoke(jsi::Runtime& runtime, const jsi::Value* argum
         cv::bitwise_not(*src, *dst);
       } break;
       case hashString("bitwise_or", 10): {
-        auto src1 = args.asMatPtr(1);
-        auto src2 = args.asMatPtr(2);
         auto dst = args.asMatPtr(3);
 
-        if (count > 4) {
-          auto mask = args.asMatPtr(4);
+        if (args.isMat(1)) {
+          auto src1 = args.asMatPtr(1);
 
-          cv::bitwise_or(*src1, *src2, *dst, *mask);
-          break;
+          if(args.isScalar(2)) {
+            auto src2 = args.asScalarPtr(2);
+            cv::bitwise_or(*src1, *src2, *dst);
+
+            if (count > 4) {
+              auto mask = args.asMatPtr(4);
+
+              cv::bitwise_or(*src1, *src2, *dst, *mask);
+              break;
+            }
+
+          } else {
+            auto src2 = args.asMatPtr(2);
+
+            if (count > 4) {
+              auto mask = args.asMatPtr(4);
+
+              cv::bitwise_or(*src1, *src2, *dst, *mask);
+              break;
+            }
+
+            cv::bitwise_or(*src1, *src2, *dst);
+          }
+        } else {
+          auto src1 = args.asScalarPtr(1);
+          auto src2 = args.asMatPtr(2);
+
+          if (count > 4) {
+            auto mask = args.asMatPtr(4);
+
+            cv::bitwise_or(*src1, *src2, *dst, *mask);
+            break;
+          }
+
+          cv::bitwise_or(*src1, *src2, *dst);
         }
-        cv::bitwise_or(*src1, *src2, *dst);
       } break;
       case hashString("bitwise_xor", 11): {
-        auto src1 = args.asMatPtr(1);
-        auto src2 = args.asMatPtr(2);
         auto dst = args.asMatPtr(3);
 
-        if (count > 4) {
-          auto mask = args.asMatPtr(4);
+        if (args.isMat(1)) {
+          auto src1 = args.asMatPtr(1);
 
-          cv::bitwise_xor(*src1, *src2, *dst, *mask);
-          break;
+          if(args.isScalar(2)) {
+            auto src2 = args.asScalarPtr(2);
+            cv::bitwise_xor(*src1, *src2, *dst);
+
+            if (count > 4) {
+              auto mask = args.asMatPtr(4);
+
+              cv::bitwise_xor(*src1, *src2, *dst, *mask);
+              break;
+            }
+
+          } else {
+            auto src2 = args.asMatPtr(2);
+
+            if (count > 4) {
+              auto mask = args.asMatPtr(4);
+
+              cv::bitwise_xor(*src1, *src2, *dst, *mask);
+              break;
+            }
+
+            cv::bitwise_xor(*src1, *src2, *dst);
+          }
+        } else {
+          auto src1 = args.asScalarPtr(1);
+          auto src2 = args.asMatPtr(2);
+
+          if (count > 4) {
+            auto mask = args.asMatPtr(4);
+
+            cv::bitwise_xor(*src1, *src2, *dst, *mask);
+            break;
+          }
+
+          cv::bitwise_xor(*src1, *src2, *dst);
         }
-        cv::bitwise_xor(*src1, *src2, *dst);
       } break;
       case hashString("borderInterpolate", 17): {
         auto p = args.asNumber(1);
@@ -203,12 +294,26 @@ jsi::Object FOCV_Function::invoke(jsi::Runtime& runtime, const jsi::Value* argum
       } break;
 
       case hashString("compare", 7): {
-        auto src1 = args.asMatPtr(1);
-        auto src2 = args.asMatPtr(2);
-        auto dst = args.asMatPtr(3);
         auto cmpop = args.asNumber(4);
+        auto dst = args.asMatPtr(3);
 
-        cv::compare(*src1, *src2, *dst, cmpop);
+        if (args.isMat(1)) {
+          auto src1 = args.asMatPtr(1);
+
+          if(args.isScalar(2)) {
+            auto src2 = args.asScalarPtr(2);
+            cv::compare(*src1, *src2, *dst, cmpop);
+          } else {
+            auto src2 = args.asMatPtr(2);
+            cv::compare(*src1, *src2, *dst, cmpop);
+          }
+        } else {
+          auto src1 = args.asScalarPtr(1);
+          auto src2 = args.asMatPtr(2);
+
+          cv::compare(*src1, *src2, *dst, cmpop);
+        }
+
       } break;
       case hashString("completeSymm", 12): {
         auto lowerToUpper = args.asBool(2);

cpp/FOCV_Object.cpp

@@ -366,3 +366,37 @@ jsi::Object FOCV_Object::copyObjectFromVector(jsi::Runtime& runtime, const jsi::
 
     return value;
 }
+
+void FOCV_Object::addObjectToVector(jsi::Runtime& runtime, const jsi::Value* arguments, size_t count) {
+    std::string createdId;
+
+    jsi::Object value(runtime);
+    std::string objectType = FOCV_JsiObject::type_from_wrap(runtime, arguments[0]);
+    std::string vectorId = FOCV_JsiObject::id_from_wrap(runtime, arguments[0]);
+    std::string objectId = FOCV_JsiObject::id_from_wrap(runtime, arguments[1]);
+
+    switch(hashString(objectType.c_str(), objectType.size())) {
+        case hashString("mat_vector", 10): {
+            auto& array = *FOCV_Storage::get<std::vector<cv::Mat>>(vectorId);
+            auto& object = *FOCV_Storage::get<cv::Mat>(objectId);
+            array.push_back(std::move(object));
+
+          int x = 4;
+        } break;
+        case hashString("rect_vector", 11): {
+            auto& array = *FOCV_Storage::get<std::vector<cv::Rect>>(vectorId);
+            auto& object = *FOCV_Storage::get<cv::Rect>(objectId);
+            array.push_back(object);
+        } break;
+        case hashString("point_vector", 12): {
+            auto& array = *FOCV_Storage::get<std::vector<cv::Point>>(vectorId);
+            auto& object = *FOCV_Storage::get<cv::Point>(objectId);
+            array.push_back(object);
+        } break;
+        case hashString("point_vector_vector", 19): {
+            auto& array = *FOCV_Storage::get<std::vector<std::vector<cv::Point>>>(vectorId);
+            auto& object = *FOCV_Storage::get<std::vector<cv::Point>>(objectId);
+            array.push_back(object);
+        } break;
+    }
+}

cpp/FOCV_Object.hpp

@@ -33,6 +33,7 @@ class FOCV_Object {
     static jsi::Object create(jsi::Runtime& runtime, const jsi::Value* arguments, size_t count);
     static jsi::Object convertToJSI(jsi::Runtime& runtime, const jsi::Value* arguments, size_t count);
     static jsi::Object copyObjectFromVector(jsi::Runtime& runtime, const jsi::Value* arguments, size_t count);
+    static void addObjectToVector(jsi::Runtime& runtime, const jsi::Value* arguments, size_t count);
 };
 
 #endif /* FOCV_Object_hpp */

cpp/react-native-fast-opencv.cpp

@@ -233,6 +233,17 @@ jsi::Value OpenCVPlugin::get(jsi::Runtime& runtime, const jsi::PropNameID& propN
           return FOCV_Object::copyObjectFromVector(runtime, arguments, count);
       });
     }
+  else if (propName == "addObjectToVector") {
+      return jsi::Function::createFromHostFunction(
+          runtime, jsi::PropNameID::forAscii(runtime, "addObjectToVector"), 1,
+          [=](jsi::Runtime& runtime, const jsi::Value& thisValue, const jsi::Value* arguments,
+              size_t count) -> jsi::Value {
+
+          FOCV_Object::addObjectToVector(runtime, arguments, count);
+
+          return jsi::Value(true);
+      });
+    }
   else if (propName == "invoke") {
       return jsi::Function::createFromHostFunction(
           runtime, jsi::PropNameID::forAscii(runtime, "invoke"), 1,

docs/pages/apidetails.md

@@ -61,6 +61,19 @@ copyObjectFromVector(vector: RectVector, itemIndex: number): Rect;
 
 ---
 
+### Add Object to Vector
+
+Adds an object to a vector.
+
+```js
+addObjectToVector(vector: MatVector, object: Mat): void;
+addObjectToVector(vector: PointVector, object: Point): void;
+addObjectToVector(vector: RectVector, object: Rect): void;
+addObjectToVector(vector: PointVectorOfVectors, object: PointVector): void;
+```
+
+---
+
 ### To JS Value
 
 Converts an object to a JS-readable object.

docs/pages/availablefunctions.md

@@ -88,7 +88,8 @@ computes bitwise conjunction of the two arrays (dst = src1 & src2) Calculates th
 - mask optional operation mask, 8-bit single channel array, that specifies elements of the output array to be changed.
 
 ```js
-invoke(name: 'bitwise_and', src1: Mat, src2: Mat, dst: Mat, mask?: Mat): void;
+invoke(name: 'bitwise_and', src1: Mat, src2: Mat | Scalar, dst: Mat, mask?: Mat)
+invoke(name: 'bitwise_and', src1: Scalar, src2: Mat, dst: Mat, mask?: Mat): void;
 ```
 
 ### bitwise_not
@@ -113,7 +114,8 @@ Calculates the per-element bit-wise disjunction of two arrays or an array and a
 - mask optional operation mask, 8-bit single channel array, that specifies elements of the output array to be changed.
 
 ```js
-invoke(name: 'bitwise_or', src1: Mat, src2: Mat, dst: Mat, mask?: Mat): void;
+invoke(name: 'bitwise_or', src1: Mat, src2: Mat | Scalar, dst: Mat, mask?: Mat): void;
+invoke(name: 'bitwise_or', src1: Scalar, src2: Mat, dst: Mat, mask?: Mat): void;
 ```
 
 ### bitwise_xor
@@ -126,7 +128,8 @@ Calculates the per-element bit-wise "exclusive or" operation on two arrays or an
 - mask optional operation mask, 8-bit single channel array, that specifies elements of the output array to be changed.
 
 ```js
-invoke(name: 'bitwise_xor', src1: Mat, src2: Mat, dst: Mat, mask?: Mat): void;
+invoke(name: 'bitwise_xor', src1: Mat, src2: Mat | Scalar, dst: Mat, mask?: Mat)
+invoke(name: 'bitwise_xor', src1: Scalar, src2: Mat, dst: Mat, mask?: Mat): void;
 ```
 
 ### borderInterpolate
@@ -242,6 +245,13 @@ Performs the per-element comparison of two arrays or an array and scalar value
 invoke(
   name: 'compare',
   src1: Mat,
+  src2: Mat | Scalar,
+  dst: Mat,
+  cmpop: CmpTypes
+): void;
+invoke(
+  name: 'compare',
+  src1: Scalar,
   src2: Mat,
   dst: Mat,
   cmpop: CmpTypes

example/Gemfile

@@ -3,7 +3,14 @@ source 'https://rubygems.org'
 # You may use http://rbenv.org/ or https://rvm.io/ to install and use this version
 ruby ">= 2.6.10"
 
-# Cocoapods 1.15 introduced a bug which break the build. We will remove the upper
-# bound in the template on Cocoapods with next React Native release.
-gem 'cocoapods', '>= 1.13', '< 1.15'
-gem 'activesupport', '>= 6.1.7.5', '< 7.1.0'
+# Exclude problematic versions of cocoapods and activesupport that causes build failures.
+gem 'cocoapods', '>= 1.13', '!= 1.15.0', '!= 1.15.1'
+gem 'activesupport', '>= 6.1.7.5', '!= 7.1.0'
+gem 'xcodeproj', '< 1.26.0'
+gem 'concurrent-ruby', '< 1.3.4'
+
+# Ruby 3.4.0 has removed some libraries from the standard library.
+gem 'bigdecimal'
+gem 'logger'
+gem 'benchmark'
+gem 'mutex_m'

example/android/app/build.gradle

@@ -49,8 +49,12 @@ react {
     //
     //   The list of flags to pass to the Hermes compiler. By default is "-O", "-output-source-map"
     // hermesFlags = ["-O", "-output-source-map"]
+
+    autolinkLibrariesWithApp()
 }
 
+
+
 /**
  * Set this to true to Run Proguard on Release builds to minify the Java bytecode.
  */
@@ -67,7 +71,7 @@ def enableProguardInReleaseBuilds = false
  * give correct results when using with locales other than en-US. Note that
  * this variant is about 6MiB larger per architecture than default.
  */
-def jscFlavor = 'org.webkit:android-jsc:+'
+def jscFlavor = 'io.github.react-native-community:jsc-android:2026004.+'
 
 android {
     ndkVersion rootProject.ext.ndkVersion
@@ -114,5 +118,3 @@ dependencies {
         implementation jscFlavor
     }
 }
-
-apply from: file("../../node_modules/@react-native-community/cli-platform-android/native_modules.gradle"); applyNativeModulesAppBuildGradle(project)

example/android/app/src/main/AndroidManifest.xml

@@ -9,7 +9,8 @@
       android:icon="@mipmap/ic_launcher"
       android:roundIcon="@mipmap/ic_launcher_round"
       android:allowBackup="false"
-      android:theme="@style/AppTheme">
+      android:theme="@style/AppTheme"
+      android:supportsRtl="true">
       <activity
         android:name=".MainActivity"
         android:label="@string/app_name"