Merge branch 'master' into feature/bfmatcher

Author: eek

.travis.yml

@@ -10,33 +10,18 @@ services:
 
 matrix:
   include:
-  - env:
-    - BUILD_TASK=test
-    - TAG=3.0.0
   - env:
     - BUILD_TASK=test
     - TAG=3.0.0-contrib
-  - env:
-    - BUILD_TASK=test
-    - TAG=3.1.0
   - env:
     - BUILD_TASK=test
     - TAG=3.1.0-contrib
-  - env:
-    - BUILD_TASK=test
-    - TAG=3.2.0
   - env:
     - BUILD_TASK=test
     - TAG=3.2.0-contrib
-  - env:
-    - BUILD_TASK=test
-    - TAG=3.3.0
   - env:
     - BUILD_TASK=test
     - TAG=3.3.0-contrib
-  - env:
-    - BUILD_TASK=test
-    - TAG=3.4.0
   - env:
     - BUILD_TASK=cover
     - TAG=3.4.0-contrib
@@ -45,10 +30,16 @@ matrix:
     - TAG=3.4.0-contrib-world
   - env:
     - BUILD_TASK=test
-    - TAG=3.4.1
+    - TAG=3.4.1-contrib
   - env:
     - BUILD_TASK=test
-    - TAG=3.4.1-contrib
+    - TAG=3.4.2-contrib
+  - env:
+    - BUILD_TASK=test
+    - TAG=3.4.3
+  - env:
+    - BUILD_TASK=test
+    - TAG=3.4.3-contrib
 
 before_install:
   - chmod +x ./ci/$BUILD_TASK/$BUILD_TASK.sh

README.md

@@ -141,6 +141,8 @@ Or simply pull from [justadudewhohacks/opencv-nodejs](https://hub.docker.com/r/j
 FROM justadudewhohacks/opencv-nodejs
 ```
 
+**Note**: The aforementioned Docker image already has ```opencv4nodejs``` installed globally. In order to prevent build errors during an ```npm install```, your ```package.json``` should not include ```opencv4nodejs```, and instead should include/require the global package either by requiring it by absolute path or setting the ```NODE_PATH``` environment variable to ```/usr/lib/node_modules``` in your Dockerfile and requiring the package as you normally would.
+
 Different OpenCV 3.x base images can be found here: https://hub.docker.com/r/justadudewhohacks/.
 
 <a name="usage-with-electron"></a>
@@ -502,4 +504,4 @@ const cv = require('opencv4nodejs')
 * <a href="https://justadudewhohacks.github.io/opencv4nodejs/docs/SIFTDetector#SIFTDetector"><b>xfeatures2d</b></a>
 * <a href="https://justadudewhohacks.github.io/opencv4nodejs/docs/MultiTracker#MultiTracker"><b>tracking</b></a>
 * <a href="https://justadudewhohacks.github.io/opencv4nodejs/docs/OCRHMMClassifier#OCRHMMClassifier"><b>text</b></a>
-* <a href="https://justadudewhohacks.github.io/opencv4nodejs/docs/EigenFaceRecognizer#EigenFaceRecognizer"><b>face</b></a>
+* <a href="https://justadudewhohacks.github.io/opencv4nodejs/docs/EigenFaceRecognizer#EigenFaceRecognizer"><b>face</b></a>

cc/core/Mat.cc

@@ -28,6 +28,8 @@ NAN_MODULE_INIT(Mat::Init) {
   Nan::SetPrototypeMethod(ctor, "at", At);
   Nan::SetPrototypeMethod(ctor, "atRaw", AtRaw);
   Nan::SetPrototypeMethod(ctor, "set", Set);
+  Nan::SetPrototypeMethod(ctor, "setTo", SetTo);
+  Nan::SetPrototypeMethod(ctor, "setToAsync", SetToAsync);
   Nan::SetPrototypeMethod(ctor, "push_back", PushBack);
   Nan::SetPrototypeMethod(ctor, "push_backAsync", PushBackAsync);
   Nan::SetPrototypeMethod(ctor, "pushBack", PushBack);
@@ -91,6 +93,8 @@ NAN_MODULE_INIT(Mat::Init) {
   Nan::SetPrototypeMethod(ctor, "meanStdDevAsync", MeanStdDevAsync);
   Nan::SetPrototypeMethod(ctor, "copyMakeBorder", CopyMakeBorder);
   Nan::SetPrototypeMethod(ctor, "copyMakeBorderAsync", CopyMakeBorderAsync);
+  Nan::SetPrototypeMethod(ctor, "reduce", Reduce);
+  Nan::SetPrototypeMethod(ctor, "reduceAsync", ReduceAsync);
 #if CV_VERSION_MINOR > 1
   Nan::SetPrototypeMethod(ctor, "rotate", Rotate);
   Nan::SetPrototypeMethod(ctor, "rotateAsync", RotateAsync);
@@ -191,7 +195,7 @@ NAN_METHOD(Mat::New) {
     self->setNativeProps(mat);
   }
   self->Wrap(info.Holder());
-    
+
   // if ExternalMemTracking is disabled, the following instruction will be a no op
     // notes: I *think* New should be called in JS thread where cv::mat has been created async,
     // so a good place to rationalise memory
@@ -293,6 +297,22 @@ NAN_METHOD(Mat::Set) {
   }
 }
 
+NAN_METHOD(Mat::SetTo) {
+  FF::SyncBinding(
+    std::make_shared<MatBindings::SetToWorker>(Mat::Converter::unwrap(info.This())),
+    "Mat::SetTo",
+    info
+  );
+}
+
+NAN_METHOD(Mat::SetToAsync) {
+  FF::AsyncBinding(
+    std::make_shared<MatBindings::SetToWorker>(Mat::Converter::unwrap(info.This())),
+    "Mat::SetToAsync",
+    info
+  );
+}
+
 NAN_METHOD(Mat::GetDataAsArray) {
   cv::Mat mat = FF_UNWRAP_MAT_AND_GET(info.This());
   FF_ARR rowArray = FF_NEW_ARRAY(mat.size[0]);
@@ -355,9 +375,9 @@ NAN_METHOD(Mat::Normalize) {
   if (!hasOptArgsObj) {
     FF_ARG_NUMBER_IFDEF(0, alpha, 1.0);
     FF_ARG_NUMBER_IFDEF(1, beta, 0.0);
-    FF_ARG_UINT_IFDEF(3, normType, normType);
-    FF_ARG_INT_IFDEF(4, dtype, dtype);
-    FF_ARG_INSTANCE_IFDEF(5, mask, Mat::constructor, FF_UNWRAP_MAT_AND_GET, mask);
+    FF_ARG_UINT_IFDEF(2, normType, normType);
+    FF_ARG_INT_IFDEF(3, dtype, dtype);
+    FF_ARG_INSTANCE_IFDEF(4, mask, Mat::constructor, FF_UNWRAP_MAT_AND_GET, mask);
   }
 
   FF_OBJ jsMat = FF_NEW_INSTANCE(constructor);
@@ -823,6 +843,22 @@ NAN_METHOD(Mat::CopyMakeBorderAsync) {
 	);
 }
 
+NAN_METHOD(Mat::Reduce) {
+	FF::SyncBinding(
+		std::make_shared<MatBindings::ReduceWorker>(Mat::Converter::unwrap(info.This())),
+		"Mat::Reduce",
+		info
+	);
+}
+
+NAN_METHOD(Mat::ReduceAsync) {
+	FF::AsyncBinding(
+		std::make_shared<MatBindings::ReduceWorker>(Mat::Converter::unwrap(info.This())),
+		"Mat::ReduceAsync",
+		info
+	);
+}
+
 #if CV_VERSION_MINOR > 1
 NAN_METHOD(Mat::Rotate) {
   FF::SyncBinding(
@@ -839,4 +875,4 @@ NAN_METHOD(Mat::RotateAsync) {
     info
   );
 }
-#endif
+#endif

cc/core/Mat.h

@@ -64,6 +64,8 @@ class Mat : public Nan::ObjectWrap {
   static NAN_METHOD(At);
   static NAN_METHOD(AtRaw);
   static NAN_METHOD(Set);
+  static NAN_METHOD(SetTo);
+  static NAN_METHOD(SetToAsync);
   static NAN_METHOD(GetDataAsArray);
   static NAN_METHOD(GetRegion);
   static NAN_METHOD(Norm);
@@ -122,11 +124,13 @@ class Mat : public Nan::ObjectWrap {
   static NAN_METHOD(MeanStdDevAsync);
   static NAN_METHOD(CopyMakeBorder);
   static NAN_METHOD(CopyMakeBorderAsync);
+  static NAN_METHOD(Reduce);
+  static NAN_METHOD(ReduceAsync);
 #if CV_VERSION_MINOR > 1
   static NAN_METHOD(Rotate);
   static NAN_METHOD(RotateAsync);
 #endif
 
 };
 
-#endif
+#endif