archive-gh-me/node-opencv
1
0
Fork 0
mirror of https://github.com/peterbraden/node-opencv.git synced 2025-12-08 19:45:55 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #624 from ATLCTO/master

Browse Source 
Add Div/Pow matrix functions.
This commit is contained in:
Peter Braden 2018-04-16 09:02:26 +02:00 committed by GitHub
commit cfc96ba0af
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 36 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/Matrix.cc
View File

@ -124,6 +124,8 @@ void Matrix::Init(Local<Object> target) {
Nan::SetPrototypeMethod(ctor, "subtract", Subtract); Nan::SetPrototypeMethod(ctor, "subtract", Subtract);
Nan::SetPrototypeMethod(ctor, "compare", Compare); Nan::SetPrototypeMethod(ctor, "compare", Compare);
Nan::SetPrototypeMethod(ctor, "mul", Mul); Nan::SetPrototypeMethod(ctor, "mul", Mul);
Nan::SetPrototypeMethod(ctor, "div", Div);
Nan::SetPrototypeMethod(ctor, "pow", Pow);
target->Set(Nan::New("Matrix").ToLocalChecked(), ctor->GetFunction()); target->Set(Nan::New("Matrix").ToLocalChecked(), ctor->GetFunction());
}; };
@ -2489,6 +2491,8 @@ NAN_METHOD(Matrix::CvtColor) {
iTransform = CV_BayerGR2BGR; iTransform = CV_BayerGR2BGR;
} else if (!strcmp(sTransform, "CV_BGR2RGB")) { } else if (!strcmp(sTransform, "CV_BGR2RGB")) {
iTransform = CV_BGR2RGB; iTransform = CV_BGR2RGB;
} else if (!strcmp(sTransform, "CV_BGRA2BGR")) {
iTransform = CV_BGRA2BGR;
} else { } else {
iTransform = 0; // to avoid compiler warning iTransform = 0; // to avoid compiler warning
Nan::ThrowTypeError("Conversion code is unsupported"); Nan::ThrowTypeError("Conversion code is unsupported");
@ -3160,3 +3164,32 @@ NAN_METHOD(Matrix::Mul) {
info.GetReturnValue().Set(out); info.GetReturnValue().Set(out);
return; return;
} }
NAN_METHOD(Matrix::Div) {
SETUP_FUNCTION(Matrix)
if (info.Length() < 1) {
Nan::ThrowTypeError("Invalid number of arguments");
}
Matrix *other = Nan::ObjectWrap::Unwrap<Matrix>(info[0]->ToObject());
cv::divide(self->mat, other->mat, self->mat);
return;
}
NAN_METHOD(Matrix::Pow) {
SETUP_FUNCTION(Matrix)
if (info.Length() < 1) {
Nan::ThrowTypeError("Invalid number of arguments");
}
double power = info[0]->NumberValue();
cv::pow(self->mat, power, self->mat);
return;
}

3
src/Matrix.h
View File

@ -149,6 +149,9 @@ public:
JSFUNC(Subtract) JSFUNC(Subtract)
JSFUNC(Compare) JSFUNC(Compare)
JSFUNC(Mul) JSFUNC(Mul)
JSFUNC(Div)
JSFUNC(Pow)
/* /*
static Handle<Value> Val(const Arguments& info); static Handle<Value> Val(const Arguments& info);
static Handle<Value> RowRange(const Arguments& info); static Handle<Value> RowRange(const Arguments& info);