Merge pull request justadudewhohacks#450 from oyyd/constructor

cc: assert constructor call in Class::New functions

Author: justadudewhohacks

cc/core/Mat.cc

@@ -115,6 +115,7 @@ void Mat::setNativeProps(cv::Mat mat) {
 };
 
 NAN_METHOD(Mat::New) {
+  FF_ASSERT_CONSTRUCT_CALL(Mat);
   Mat* self = new Mat();
   /* from channels */
   if (info.Length() == 1 && info[0]->IsArray()) {

cc/core/Point.cc

@@ -34,6 +34,7 @@ NAN_MODULE_INIT(Point::Init) {
 };
 
 NAN_METHOD(Point::New) {
+	FF_ASSERT_CONSTRUCT_CALL(Point);
 	if (info.Length() < 2) {
 		return Nan::ThrowError("Point::New - expected arguments x, y, (z)");
 	}
@@ -51,4 +52,4 @@ NAN_METHOD(Point::New) {
 		Nan::ObjectWrap::Unwrap<Point2>(jsPoint)->pt = cv::Point2d(x, y);
 	}
   info.GetReturnValue().Set(jsPoint);
-}
+}

cc/core/Rect.cc

@@ -26,6 +26,7 @@ NAN_MODULE_INIT(Rect::Init) {
 };
 
 NAN_METHOD(Rect::New) {
+  FF_ASSERT_CONSTRUCT_CALL(Rect);
   Rect* self = new Rect();
   if (info.Length() == 0) {
     self->rect = cv::Rect2d();

cc/core/RotatedRect.cc

@@ -17,6 +17,7 @@ NAN_MODULE_INIT(RotatedRect::Init) {
 };
 
 NAN_METHOD(RotatedRect::New) {
+	FF_ASSERT_CONSTRUCT_CALL(RotatedRect);
 	RotatedRect* self = new RotatedRect();
 	if (info.Length() == 0) {
 		self->rect = cv::RotatedRect();
@@ -40,4 +41,4 @@ NAN_METHOD(RotatedRect::New) {
 	}
 	self->Wrap(info.Holder());
 	info.GetReturnValue().Set(info.Holder());
-}
+}

cc/core/Size.cc

@@ -14,6 +14,7 @@ NAN_MODULE_INIT(Size::Init) {
 };
 
 NAN_METHOD(Size::New) {
+	FF_ASSERT_CONSTRUCT_CALL(Size);
 	Size* self = new Size();
 	if (info.Length() > 0) {
 		if (info.Length() < 2) {
@@ -25,4 +26,4 @@ NAN_METHOD(Size::New) {
 	}
 	self->Wrap(info.Holder());
 	info.GetReturnValue().Set(info.Holder());
-}
+}

cc/core/TermCriteria.cc

@@ -15,6 +15,7 @@ NAN_MODULE_INIT(TermCriteria::Init) {
 };
 
 NAN_METHOD(TermCriteria::New) {
+	FF_ASSERT_CONSTRUCT_CALL(TermCriteria);
 	FF_METHOD_CONTEXT("TermCriteria::New");
 	TermCriteria* self = new TermCriteria();
 	if (info.Length() > 0) {
@@ -25,4 +26,4 @@ NAN_METHOD(TermCriteria::New) {
 	}
 	self->Wrap(info.Holder());
 	info.GetReturnValue().Set(info.Holder());
-}
+}

cc/core/Vec.cc

@@ -49,6 +49,7 @@ NAN_MODULE_INIT(Vec::Init) {
 };
 
 NAN_METHOD(Vec::New) {
+	FF_ASSERT_CONSTRUCT_CALL(Vec);
 	if (info.Length() < 2) {
 		return Nan::ThrowError("Vec::New - expected arguments (w), x, y, (z)");
 	}
@@ -57,9 +58,9 @@ NAN_METHOD(Vec::New) {
 		v8::Local<v8::Function> ct = Nan::New(Vec4::constructor)->GetFunction();
 		jsVec = Nan::NewInstance(ct).ToLocalChecked();
 		Nan::ObjectWrap::Unwrap<Vec4>(jsVec)->vec = cv::Vec4d(
-			info[0]->NumberValue(), 
-			info[1]->NumberValue(), 
-			info[2]->NumberValue(), 
+			info[0]->NumberValue(),
+			info[1]->NumberValue(),
+			info[2]->NumberValue(),
 			info[3]->NumberValue()
 		);
 	} else {
@@ -77,4 +78,4 @@ NAN_METHOD(Vec::New) {
 		}
 	}
   info.GetReturnValue().Set(jsVec);
-}
+}

cc/macros.h

@@ -88,6 +88,12 @@ static FF_FUNC_TYPE ff_func = FF_FUNC_TYPE();
 
 #define FF_ARG_IS_OBJECT(argN) FF_HAS_ARG(argN) && info[argN]->IsObject() && !info[argN]->IsArray() && !info[argN]->IsFunction()
 
+#define FF_ASSERT_CONSTRUCT_CALL(ctor)																\
+  if (!info.IsConstructCall()) {																			\
+    return Nan::ThrowError(FF_NEW_STRING(std::string(#ctor)						\
+        + "::New -  expect to be called with \"new\"")); 							\
+  }
+
 /* for setters */
 #define FF_REQUIRE_VALUE(ff_value, ff_type)													\
   if (!ff_type.checkType(ff_value)) {																\

cc/modules/dnn/Net.cc

@@ -25,6 +25,7 @@ NAN_MODULE_INIT(Net::Init) {
 };
 
 NAN_METHOD(Net::New) {
+  FF_ASSERT_CONSTRUCT_CALL(Net);
   Net* self = new Net();
   self->Wrap(info.Holder());
   info.GetReturnValue().Set(info.Holder());
@@ -62,4 +63,4 @@ NAN_METHOD(Net::ForwardAsync) {
   );
 }
 
-#endif
+#endif

cc/modules/face/EigenFaceRecognizer.cc

@@ -18,6 +18,7 @@ NAN_MODULE_INIT(EigenFaceRecognizer::Init) {
 };
 
 NAN_METHOD(EigenFaceRecognizer::New) {
+	FF_ASSERT_CONSTRUCT_CALL(EigenFaceRecognizer);
 	FF::TryCatch tryCatch;
 	FaceRecognizerBindings::NewWorker worker;
 
@@ -37,4 +38,4 @@ NAN_METHOD(EigenFaceRecognizer::New) {
 	FF_RETURN(info.Holder());
 };
 
-#endif
+#endif