Merge branch 'main' of https://github.com/hwjfordev/react-native-fast-opencv

Author: hwjfordev

cpp/FOCV_Object.cpp

@@ -11,6 +11,9 @@
 #include "jsi/TypedArray.h"
 #include <opencv2/opencv.hpp>
 #include "ConvertImage.hpp"
+#include "jsi/TypedArray.h"
+
+using namespace mrousavy;
 
 // General idea and this function for hashing is from
 // https://mrousavy.com/blog/Hashing-String-Ifs
@@ -35,8 +38,29 @@ jsi::Object FOCV_Object::create(jsi::Runtime& runtime, const jsi::Value* argumen
             int rows = arguments[1].asNumber();
             int cols = arguments[2].asNumber();
             int type = arguments[3].asNumber();
-            cv::Mat object(rows, cols, type);
-            id = FOCV_Storage::save(object);
+            
+            if(arguments[4].isObject()) {
+                auto rawArray = arguments[4].asObject(runtime);
+                auto array = rawArray.asArray(runtime);
+                
+                auto rawLength = rawArray.getProperty(runtime, "length");
+                auto length = rawLength.asNumber();
+                
+                std::vector<float> vec;
+                
+                for(auto i = 0; i < length; i++) {
+                    vec.push_back(array.getValueAtIndex(runtime, i).asNumber());
+                }
+
+                cv::Mat mat{vec, true};
+                mat = mat.reshape(1, rows);
+                mat.convertTo(mat, type);
+                
+                id = FOCV_Storage::save(mat);
+            } else {
+                cv::Mat object(rows, cols, type);
+                id = FOCV_Storage::save(object);
+            }
         } break;
         case hashString("mat_vector", 10): {
             std::vector<cv::Mat> object;
@@ -123,6 +147,7 @@ jsi::Object FOCV_Object::convertToJSI(jsi::Runtime& runtime, const jsi::Value* a
     switch(hashString(objectType.c_str(), objectType.size())) {
         case hashString("mat", 3): {
             auto mat = *FOCV_Storage::get<cv::Mat>(id);
+            mat.convertTo(mat, CV_8U);
 
             value.setProperty(runtime, "base64", jsi::String::createFromUtf8(runtime, ImageConverter::mat2str(mat)));
             value.setProperty(runtime, "size", jsi::Value(mat.size));

example/ios/Podfile.lock

@@ -936,7 +936,7 @@ PODS:
   - React-Mapbuffer (0.74.4):
     - glog
     - React-debug
-  - react-native-fast-opencv (0.1.0):
+  - react-native-fast-opencv (0.2.0):
     - DoubleConversion
     - glog
     - hermes-engine
@@ -979,7 +979,7 @@ PODS:
     - ReactCommon/turbomodule/bridging
     - ReactCommon/turbomodule/core
     - Yoga
-  - react-native-skia (1.3.10):
+  - react-native-skia (1.3.11):
     - DoubleConversion
     - glog
     - hermes-engine
@@ -1235,7 +1235,51 @@ PODS:
     - React-logger (= 0.74.4)
     - React-perflogger (= 0.74.4)
     - React-utils (= 0.74.4)
-  - RNReanimated (3.14.0):
+  - RNReanimated (3.15.0):
+    - DoubleConversion
+    - glog
+    - hermes-engine
+    - RCT-Folly (= 2024.01.01.00)
+    - RCTRequired
+    - RCTTypeSafety
+    - React-Codegen
+    - React-Core
+    - React-debug
+    - React-Fabric
+    - React-featureflags
+    - React-graphics
+    - React-ImageManager
+    - React-NativeModulesApple
+    - React-RCTFabric
+    - React-rendererdebug
+    - React-utils
+    - ReactCommon/turbomodule/bridging
+    - ReactCommon/turbomodule/core
+    - RNReanimated/reanimated (= 3.15.0)
+    - RNReanimated/worklets (= 3.15.0)
+    - Yoga
+  - RNReanimated/reanimated (3.15.0):
+    - DoubleConversion
+    - glog
+    - hermes-engine
+    - RCT-Folly (= 2024.01.01.00)
+    - RCTRequired
+    - RCTTypeSafety
+    - React-Codegen
+    - React-Core
+    - React-debug
+    - React-Fabric
+    - React-featureflags
+    - React-graphics
+    - React-ImageManager
+    - React-NativeModulesApple
+    - React-RCTFabric
+    - React-rendererdebug
+    - React-utils
+    - ReactCommon/turbomodule/bridging
+    - ReactCommon/turbomodule/core
+    - Yoga
+  - RNReanimated/worklets (3.15.0):
     - DoubleConversion
     - glog
     - hermes-engine
@@ -1520,9 +1564,9 @@ SPEC CHECKSUMS:
   React-jsitracing: 4e9c99e73a6269b27b0d4cbab277dd90df3e5ac0
   React-logger: fbfb50e2a2b1b46ee087f0a52739fadecc5e81a4
   React-Mapbuffer: d39610dff659d8cf1fea485abae08bbf6f9c8279
-  react-native-fast-opencv: ab1ec9e61ccab56c9120d847eefddd636eea859a
+  react-native-fast-opencv: d143740f4a4f50a0946a00fbc7e8069ea5427695
   react-native-image-picker: c3afe5472ef870d98a4b28415fc0b928161ee5f7
-  react-native-skia: 4857f8a85d0e4fc152c7b8aff4fbcc7573be1cf9
+  react-native-skia: 8da84ea9410504bf27f0db229539a43f6caabb6a
   react-native-worklets-core: f51430dd07bf5343d4918d28a4bb00fe8f98b982
   React-nativeconfig: 2be4363c2c4ac2b42419577774e83e4e4fd2af9f
   React-NativeModulesApple: 453ada38f826a508e48872c7a7877c431af48bba
@@ -1547,7 +1591,7 @@ SPEC CHECKSUMS:
   React-runtimescheduler: 3f312d33f475467a59864e0c5ab8708461387d1c
   React-utils: e8b0eac797c81c574b24f6515fec4015599b643c
   ReactCommon: eebffb37a90138c6db6eb8b2d952e7e5c6bc083c
-  RNReanimated: f4ff116e33e0afc3d127f70efe928847c7c66355
+  RNReanimated: 45553a3ae29a75a76269595f8554d07d4090e392
   SocketRocket: abac6f5de4d4d62d24e11868d7a2f427e0ef940d
   vision-camera-resize-plugin: 4306d5df9bce0e603bbe6ab04337f21a606f4ad1
   VisionCamera: 057aff621f7801b7d99a00d157fa39244bbd4fd2

package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-fast-opencv",
-  "version": "0.2.0",
+  "version": "0.2.1",
   "description": "OpenCV port to React Native",
   "source": "./src/index.tsx",
   "main": "./lib/commonjs/index.js",

src/functions/ImageProcessing/ImageFiltering.ts

@@ -132,7 +132,7 @@ export type ImageFiltering = {
     name: 'filter2D',
     src: Mat,
     dst: Mat,
-    ddepth: DataTypes,
+    ddepth: number,
     kernel: Mat,
     anchor: Point,
     delat: number,

src/objects/Objects.ts

@@ -21,7 +21,8 @@ export type Objects = {
     type: ObjectType.Mat,
     rows: number,
     cols: number,
-    dataType: DataTypes
+    dataType: DataTypes,
+    data?: number[]
   ): Mat;
   createObject(type: ObjectType.MatVector): MatVector;
   createObject(type: ObjectType.Point, x: number, y: number): Point;