added tests and docs for deep neural nets + added tests for new Mat utilities

Author: justadudewhohacks

cc/modules/dnn/Net.cc

@@ -61,7 +61,7 @@ struct Net::SetInputWorker : public SimpleWorker {
 
 NAN_METHOD(Net::SetInput) {
 	SetInputWorker worker(Net::Converter::unwrap(info.This()));
-	FF_WORKER_SYNC("Net::SetInputWorker", worker);
+	FF_WORKER_SYNC("Net::SetInput", worker);
 	info.GetReturnValue().Set(worker.getReturnValue());
 }
 

cc/modules/dnn/dnn.cc

@@ -16,7 +16,7 @@ NAN_MODULE_INIT(Dnn::Init) {
 	Nan::SetMethod(target, "readNetFromTensorflow", ReadNetFromTensorflow);
 	Nan::SetMethod(target, "readNetFromTensorflowAsync", ReadNetFromTensorflowAsync);
 	Nan::SetMethod(target, "blobFromImage", BlobFromImage);
-	Nan::SetMethod(target, "blobFromImagsAsync", BlobFromImageAsync);
+	Nan::SetMethod(target, "blobFromImageAsync", BlobFromImageAsync);
 	Nan::SetMethod(target, "blobFromImages", BlobFromImages);
 	Nan::SetMethod(target, "blobFromImagesAsync", BlobFromImagesAsync);
 };
@@ -97,9 +97,9 @@ struct Dnn::BlobFromImageWorker : public SimpleWorker {
 	bool unwrapOptionalArgs(Nan::NAN_METHOD_ARGS_TYPE info) {
 		return (
 			DoubleConverter::optArg(1, &scalefactor, info) ||
-			BoolConverter::optArg(2, &swapRB, info) ||
-			Size::Converter::optArg(3, &size, info) ||
-			Vec3::Converter::optArg(4, &mean, info)
+			Size::Converter::optArg(2, &size, info) ||
+			Vec3::Converter::optArg(3, &mean, info) ||
+			BoolConverter::optArg(4, &swapRB, info)
 		);
 	}
 
@@ -108,7 +108,7 @@ struct Dnn::BlobFromImageWorker : public SimpleWorker {
 	}
 
 	bool unwrapOptionalArgsFromOpts(Nan::NAN_METHOD_ARGS_TYPE info) {
-		v8::Local<v8::Object> opts = info[3]->ToObject();
+		v8::Local<v8::Object> opts = info[1]->ToObject();
 		return (
 			DoubleConverter::optProp(&scalefactor, "scalefactor", opts) ||
 			BoolConverter::optProp(&swapRB, "swapRB", opts) ||

cc/opencv4nodejs.cc

@@ -10,7 +10,6 @@
 #include "modules/features2d/features2d.h"
 #include "modules/objdetect/objdetect.h"
 #include "modules/machinelearning/machinelearning.h"
-#include "modules/dnn/dnn.h"
 #ifdef HAVE_TRACKING
 #include "modules/tracking/tracking.h"
 #endif // HAVE_TRACKING

doc/README.md

@@ -260,6 +260,18 @@ Missing some function bindings? No problem! - <a href="https://github.com/justad
     * <a href="./machinelearning/SVM.md#load">load</a>
     * <a href="./machinelearning/SVM.md#getSupportVectors">getSupportVectors</a>
     * <a href="./machinelearning/SVM.md#calcError">calcError</a>
+* <a href="./dnn/dnn.md"><b>dnn</b></a>
+  * <a href="./dnn/Net.md"><b>Net</b></a>
+    * <a href="./dnn/Net.md#setInput">setInput</a>
+    * <a href="./dnn/Net.md#setInputAsync">setInputAsync</a>
+    * <a href="./dnn/Net.md#forward">forward</a>
+    * <a href="./dnn/Net.md#forwardAsync">forwardAsync</a>
+  * <a href="./dnn/dnn.md#readNetFromTensorflow">readNetFromTensorflow</a>
+  * <a href="./dnn/dnn.md#readNetFromTensorflowAsync">readNetFromTensorflowAsync</a>
+  * <a href="./dnn/dnn.md#blobFromImage">blobFromImage</a>
+  * <a href="./dnn/dnn.md#blobFromImageAsync">blobFromImageAsync</a>
+  * <a href="./dnn/dnn.md#blobFromImages">blobFromImages</a>
+  * <a href="./dnn/dnn.md#blobFromImagesAsync">blobFromImagesAsync</a>
 * <a href="./video/video.md"><b>video</b></a>
   * <a href="./video/BackgroundSubtractorMOG2.md"><b>BackgroundSubtractorMOG2</b></a>
     * <a href="./video/BackgroundSubtractorMOG2.md#apply">apply</a>

doc/dnn/Net.md

@@ -0,0 +1,31 @@
+# Net (v3.3+)
+
+<a name="setInput"></a>
+
+### setInput
+``` javascript
+net.setInput(Mat blob, String inputName = '')
+```
+
+<a name="setInputAsync"></a>
+
+### setInputAsync
+``` javascript
+net.setInputAsync(callback(Error err))
+net.setInputAsync(String inputName = '', callback(Error err))
+```
+
+<a name="forward"></a>
+
+### forward
+``` javascript
+Mat : forward(String inputName = '')
+```
+
+<a name="forwardAsync"></a>
+
+### forwardAsync
+``` javascript
+forwardAsync(callback(Error err, Mat result))
+forwardAsync(String inputName, callback(Error err, Mat result))
+```

doc/dnn/dnn.md

@@ -0,0 +1,47 @@
+# dnn (v3.3+)
+
+<a name="readNetFromTensorflow"></a>
+
+### readNetFromTensorflow
+``` javascript
+Net : readNetFromTensorflow(String modelPath)
+```
+
+<a name="readNetFromTensorflowAsync"></a>
+
+### readNetFromTensorflowAsync
+``` javascript
+readNetFromTensorflowAsync(String modelPath, callback(Error err, Net net))
+```
+
+<a name="blobFromImage"></a>
+
+### blobFromImage
+``` javascript
+Mat : blobFromImage(Mat image, Number scaleFactor = 1.0, Size size = Size(), Vec3 mean = Vec3(), Boolean swapRB = true)
+```
+
+<a name="blobFromImageAsync"></a>
+
+### blobFromImageAsync
+``` javascript
+blobFromImageAsync(Mat image, callback(Error err, Mat blob))
+blobFromImageAsync(Mat image, ...opts, callback(Error err, Mat blob))
+blobFromImageAsync(Mat image, { opts }, callback(Error err, Mat blob))
+```
+
+<a name="blobFromImages"></a>
+
+### blobFromImages
+``` javascript
+Mat : blobFromImages([Mat] image, Number scaleFactor = 1.0, Size size = Size(), Vec3 mean = Vec3(), Boolean swapRB = true)
+```
+
+<a name="blobFromImagesAsync"></a>
+
+### blobFromImagesAsync
+``` javascript
+blobFromImagesAsync([Mat] images, callback(Error err, Mat blob))
+blobFromImagesAsync([Mat] images, ...opts, callback(Error err, Mat blob))
+blobFromImagesAsync([Mat] images, { opts }, callback(Error err, Mat blob))
+```