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

Fix variable names and account for 3/4 value Scalar colors

Browse Source
This commit is contained in:
Fotios Lindiakos 2016-10-10 17:31:15 -04:00
parent 5a306658df
commit ff35ec9551
1 changed files with 31 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
src/Matrix.cc
View File

@ -2545,6 +2545,7 @@ NAN_METHOD(Matrix::Mean) {
info.GetReturnValue().Set(arr);
}
// http://docs.opencv.org/2.4/modules/imgproc/doc/filtering.html#copymakeborder
NAN_METHOD(Matrix::CopyMakeBorder) {
SETUP_FUNCTION(Matrix)
@ -2553,40 +2554,46 @@ NAN_METHOD(Matrix::CopyMakeBorder) {
double l = info[2]->NumberValue();
double r = info[3]->NumberValue();
int fill = cv::BORDER_DEFAULT;
cv::Scalar color;
int borderType = cv::BORDER_DEFAULT;
cv::Scalar value;
if (info.Length() > 4) {
fill = info[4]->IntegerValue();
color = cv::Scalar(0, 0, 0, 0);
if (fill == cv::BORDER_CONSTANT && info[5]->IsArray()) {
Local<Object> objColor = info[5]->ToObject();
borderType = info[4]->IntegerValue();
value = cv::Scalar(0, 0, 0, 0);
if (borderType == cv::BORDER_CONSTANT) {
if (!info[5]->IsArray()) {
Nan::ThrowTypeError("The argument must be an array");
}
v8::Local<v8::Array> objColor = v8::Local<v8::Array>::Cast(info[5]);
unsigned int length = objColor->Length();
Local<Value> valB = objColor->Get(0);
Local<Value> valG = objColor->Get(1);
Local<Value> valR = objColor->Get(2);
Local<Value> valA = objColor->Get(3);
color = cv::Scalar(
valB->IntegerValue(),
valG->IntegerValue(),
valR->IntegerValue(),
valA->IntegerValue()
);
if (length == 3) {
value = cv::Scalar(
valB->IntegerValue(),
valG->IntegerValue(),
valR->IntegerValue()
);
} else if (length == 4) {
Local<Value> valA = objColor->Get(3);
value = cv::Scalar(
valB->IntegerValue(),
valG->IntegerValue(),
valR->IntegerValue(),
valA->IntegerValue()
);
} else {
Nan::ThrowError("Fill must include 3 or 4 colors");
}
}
}
// if (info[6]->IsArray()) {
// Local<Object> objColor = info[4]->ToObject();
// color = setColor(objColor);
//
// cv::Scalar color = cv::Scalar(valB->IntegerValue(), valG->IntegerValue(),
// valR->IntegerValue());
// }
//
cv::Mat padded;
cv::copyMakeBorder(self->mat, padded, t, b, l, r, fill, color);
//
cv::copyMakeBorder(self->mat, padded, t, b, l, r, borderType, value);
~self->mat;
self->mat = padded;