Merge branch 'master' of https://github.com/peterbraden/node-opencv

Conflicts:
	src/Matrix.cc
	src/Matrix.h

src/Matrix.cc

@@ -111,7 +111,11 @@ void Matrix::Init(Local<Object> target) {
   Nan::SetPrototypeMethod(ctor, "shift", Shift);
   Nan::SetPrototypeMethod(ctor, "reshape", Reshape);
   Nan::SetPrototypeMethod(ctor, "release", Release);
+<<<<<<< HEAD
   Nan::SetPrototypeMethod(ctor, "inpaint", Inpaint);
+=======
+  Nan::SetPrototypeMethod(ctor, "subtract", Subtract);
+>>>>>>> df9959ae7dbfa57fb39147dcb745e67775154b11
 
   target->Set(Nan::New("Matrix").ToLocalChecked(), ctor->GetFunction());
 };
@@ -2606,3 +2610,17 @@ NAN_METHOD(Matrix::Inpaint) {
 
   info.GetReturnValue().Set(img_to_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

@@ -128,6 +128,8 @@ class Matrix: public node_opencv::Matrix{
   JSFUNC(Release)
 
   JSFUNC(Inpaint)
+
+  JSFUNC(Subtract)
   /*
    static Handle<Value> Val(const Arguments& info);
    static Handle<Value> RowRange(const Arguments& info);