[20160423] sync to upstream/master

src/Matrix.cc

@@ -106,9 +106,11 @@ void Matrix::Init(Local<Object> target) {
   Nan::SetPrototypeMethod(ctor, "copyWithMask", CopyWithMask);
   Nan::SetPrototypeMethod(ctor, "setWithMask", SetWithMask);
   Nan::SetPrototypeMethod(ctor, "meanWithMask", MeanWithMask);
+  Nan::SetPrototypeMethod(ctor, "mean", Mean);
   Nan::SetPrototypeMethod(ctor, "shift", Shift);
   Nan::SetPrototypeMethod(ctor, "reshape", Reshape);
   Nan::SetPrototypeMethod(ctor, "release", Release);
+  Nan::SetPrototypeMethod(ctor, "subtract", Subtract);
 
   target->Set(Nan::New("Matrix").ToLocalChecked(), ctor->GetFunction());
 };
@@ -982,7 +984,7 @@ class AsyncSaveWorker: public Nan::AsyncWorker {
 
 private:
   Matrix* matrix;
-  char* filename;
+  std::string filename;
   int res;
 };
 
@@ -2483,10 +2485,24 @@ NAN_METHOD(Matrix::MeanWithMask) {
   Matrix *mask = Nan::ObjectWrap::Unwrap<Matrix>(info[0]->ToObject());
 
   cv::Scalar means = cv::mean(self->mat, mask->mat);
-  v8::Local < v8::Array > arr = Nan::New<Array>(3);
+  v8::Local < v8::Array > arr = Nan::New<Array>(4);
   arr->Set(0, Nan::New<Number>(means[0]));
   arr->Set(1, Nan::New<Number>(means[1]));
   arr->Set(2, Nan::New<Number>(means[2]));
+  arr->Set(3, Nan::New<Number>(means[3]));
+
+  info.GetReturnValue().Set(arr);
+}
+
+NAN_METHOD(Matrix::Mean) {
+  SETUP_FUNCTION(Matrix)
+
+  cv::Scalar means = cv::mean(self->mat);
+  v8::Local<v8::Array> arr = Nan::New<Array>(4);
+  arr->Set(0, Nan::New<Number>(means[0]));
+  arr->Set(1, Nan::New<Number>(means[1]));
+  arr->Set(2, Nan::New<Number>(means[2]));
+  arr->Set(3, Nan::New<Number>(means[3]));
 
   info.GetReturnValue().Set(arr);
 }
@@ -2569,3 +2585,17 @@ NAN_METHOD(Matrix::Release) {
 
   return;
 }
+
+NAN_METHOD(Matrix::Subtract) {
+  SETUP_FUNCTION(Matrix)
+
+  if (info.Length() < 1) {
+    Nan::ThrowTypeError("Invalid number of arguments");
+  }
+
+  Matrix *other = Nan::ObjectWrap::Unwrap<Matrix>(info[0]->ToObject());
+
+  self->mat -= other->mat;
+
+  return;
+}

src/Matrix.h

@@ -121,10 +121,13 @@ class Matrix: public node_opencv::Matrix{
   JSFUNC(CopyWithMask)
   JSFUNC(SetWithMask)
   JSFUNC(MeanWithMask)
+  JSFUNC(Mean)
   JSFUNC(Shift)
   JSFUNC(Reshape)
 
   JSFUNC(Release)
+
+  JSFUNC(Subtract)
   /*
    static Handle<Value> Val(const Arguments& info);
    static Handle<Value> RowRange(const Arguments& info);

test/unit.js

@@ -341,6 +341,28 @@ test('Native Matrix', function(assert) {
   assert.end();
 })
 
+test('Subtract', function(assert) {
+  var a = new cv.Matrix.Zeros(1,1);
+  a.set(0, 0, 3);
+  var b = new cv.Matrix.Zeros(1,1);
+  b.set(0, 0, 1);
+  a.subtract(b);
+  assert.deepEqual(a.get(0, 0), 2);
+  assert.end();
+});
+
+test('Mean', function(assert) {
+  var a = new cv.Matrix.Zeros(2, 2, cv.Constants.CV_8UC3);
+
+  // Set [0, 0] element to 1 for all three channels
+  a.set(0, 0, 1, 0);
+  a.set(0, 0, 1, 1);
+  a.set(0, 0, 1, 2);
+
+  var means = a.mean();
+  assert.deepEqual(means, [0.25, 0.25, 0.25, 0]);
+  assert.end();
+});
 
 // Test the examples folder.
 require('./examples')()