Skip to content

Extend binding functionality #155

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
+1,153 −162
Open

Extend binding functionality #155

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
cbbbcbf
Extend binding functionality
Sep 1, 2014
de429f1
More binding functions for Matrix
Sep 2, 2014
2171244
Forgiveness
Sep 2, 2014
3e260b7
Add mask support to bitwise_and bind
Sep 6, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Add mask support to bitwise_and bind
  • Loading branch information
Jorge Lahoz authored and Jorge Lahoz committed Sep 6, 2014
commit 3e260b7eda8a6fbf557f7c8edad1ece279a5c047
12 changes: 10 additions & 2 deletions src/Matrix.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1073,9 +1073,17 @@ Matrix::BitwiseAnd(const v8::Arguments& args) {

Matrix *src1 = ObjectWrap::Unwrap<Matrix>(args[0]->ToObject());
Matrix *src2 = ObjectWrap::Unwrap<Matrix>(args[1]->ToObject());
Matrix *mask = NULL;
if (args.Length()>2 && !(args[2]->IsNull()) && args[2]->IsObject()){
mask = ObjectWrap::Unwrap<Matrix>(args[2]->ToObject());
}

cv::bitwise_and(src1->mat, src2->mat, self->mat);

if (mask!=NULL) {
cv::bitwise_and(src1->mat, src2->mat, self->mat, mask->mat);
}else{
cv::bitwise_and(src1->mat, src2->mat, self->mat);
}

return scope.Close(v8::Null());
}

Expand Down