Skip to content

Ocv3 features2d #615

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 3 commits into
base: master
Choose a base branch
from
Open

Ocv3 features2d #615

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5801b95
Update Features2d to OCV 3
btsimonh Mar 2, 2018
7875fe1
Add Matrix(Matrix*) constructor (comes for memory stuff).
btsimonh Mar 2, 2018
943fb71
include features2d if ocv 3
btsimonh Mar 2, 2018
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
Next Next commit
Add Matrix(Matrix*) constructor (comes for memory stuff).
  • Loading branch information
@btsimonh
btsimonh committed Mar 2, 2018
commit 7875fe1cc7e41d5af7d890b840fcc82969b60b90
5 changes: 5 additions & 0 deletions src/Matrix.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,6 +176,11 @@ Matrix::Matrix(int rows, int cols, int type) :
mat = cv::Mat(rows, cols, type);
}

Matrix::Matrix(Matrix *m) :
node_opencv::Matrix() {
mat = cv::Mat(m->mat);
}

Matrix::Matrix(cv::Mat m, cv::Rect roi) :
node_opencv::Matrix() {
mat = cv::Mat(m, roi);
Expand Down
1 change: 1 addition & 0 deletions src/Matrix.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ class Matrix: public node_opencv::Matrix{
Matrix(cv::Mat other, cv::Rect roi);
Matrix(int rows, int cols);
Matrix(int rows, int cols, int type);
Matrix(Matrix *m);
Matrix(int rows, int cols, int type, Local<Object> scalarObj);

static double DblGet(cv::Mat mat, int i, int j);
Expand Down