Skip to content

Add inpaint function #410

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
Open

Add inpaint function #410

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7eaa429
Add inpaint function
Mar 23, 2016
62a5794
Convert argument mask to CV_8U when inpainting
Mar 29, 2016
e6f01f7
Merge branch 'master' of https://github.com/peterbraden/node-opencv
May 18, 2016
3f4042e
Fix minor merge mistake
May 18, 2016
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
Fix minor merge mistake
  • Loading branch information
Alexander Milchev committed May 18, 2016
commit 3f4042edadd105e0ce9a687eafbb3bb066f641ff
3 changes: 0 additions & 3 deletions src/Matrix.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,11 +111,8 @@ 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());
};
Expand Down