Skip to content

src: return when throwing errors #439

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 1 commit into from
Oct 29, 2018
Merged

src: return when throwing errors #439

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion cc/core/Mat.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -326,7 +326,7 @@ NAN_METHOD(Mat::GetDataAsArray) {

NAN_METHOD(Mat::GetRegion) {
if (!FF_IS_INSTANCE(Rect::constructor, info[0])) {
Nan::ThrowError("Mat::GetRegion expected arg0 to be an instance of Rect");
return Nan::ThrowError("Mat::GetRegion expected arg0 to be an instance of Rect");
}
cv::Rect2d rect = FF_UNWRAP(info[0]->ToObject(), Rect)->rect;
FF_OBJ jsRegion = FF_NEW_INSTANCE(constructor);
Expand Down
14 changes: 13 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 @@ -980,5 +980,17 @@ describe('Mat', () => {
describe('Row average', makeTest(1, cv.REDUCE_AVG, cv.CV_32F, [ [ 1 ] ]));
describe('Row max', makeTest(1, cv.REDUCE_MAX, -1, [ [ 1 ] ]));
describe('Row min', makeTest(1, cv.REDUCE_MIN, -1, [ [ 1 ] ]));
})
});

describe('checking of non-instance arguments', () => {
it('should throw errors with correct error '
+ 'messages with non-instance arguments', () => {
const img = getTestImg().bgrToGray();

assertError(
() => img.getRegion(0, 1, 2, 3),
'Error: Mat::GetRegion expected arg0 to be an instance of Rect'
);
});
});
});