Skip to content

Issue 480 #485

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

Merged
justadudewhohacks merged 2 commits into from
Jan 8, 2019
Merged

Issue 480 #485

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9f89f45
unit test for #480
piercus Jan 2, 2019
42422ab
fix: #480 by adding an error when GetData is called and ROI is defined
piercus Jan 7, 2019
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
8 changes: 8 additions & 0 deletions cc/core/MatBindings.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,8 +129,16 @@ namespace MatBindings {
size_t size;
char *data;

cv::Size sizeTotal;
cv::Point ofs;

std::string executeCatchCvExceptionWorker() {
size = mat.rows * mat.cols * mat.elemSize();
mat.locateROI(sizeTotal, ofs);

if(sizeTotal.width != mat.cols || sizeTotal.height != mat.rows){
return "Cannot call GetData when Region of Interest is defined (i.e. after getRegion) use matrix.copyTo to copy ROI to a new matrix";
}
data = static_cast<char *>(malloc(size));
memcpy(data, mat.data, size);
return "";
Expand Down
9 changes: 8 additions & 1 deletion test/tests/core/Mat/Mat.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -323,7 +323,14 @@ describe('Mat', () => {
expect(buf).instanceOf(Buffer).lengthOf(18);
});
});


describe('getData after getRegion should throw an error', () => {
it('should return buffer of with data of single channeled Mat', () => {
const region = matC3.getRegion(new cv.Rect(0, 0, 2, 2));
assertError(() => region.getData(), "Mat::GetData - Cannot call GetData when Region of Interest is defined (i.e. after getRegion) use matrix.copyTo to copy ROI to a new matrix")
});
});

describe('async', () => {
it('should return buffer with data of single channeled Mat', (done) => {
matC1.getDataAsync((err, buf) => {
Expand Down