Merge pull request #439 from oyyd/fix-return

src: return when throwing errors

Author: justadudewhohacks

cc/core/Mat.cc

@@ -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);

test/tests/core/Mat/Mat.test.js

@@ -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'
+      );
+    });
+  });
 });