Update: BFMatcher constructor & optional args

Author: eek

cc/modules/features2d/BFMatcher.cc

@@ -4,31 +4,43 @@ Nan::Persistent<v8::FunctionTemplate> BFMatcher::constructor;
 
 NAN_MODULE_INIT(BFMatcher::Init) {
   v8::Local<v8::FunctionTemplate> ctor = Nan::New<v8::FunctionTemplate>(BFMatcher::New);
+	v8::Local<v8::ObjectTemplate> instanceTemplate = ctor->InstanceTemplate();
+
+	BFMatcher::Init(ctor);
   constructor.Reset(ctor);
-  ctor->InstanceTemplate()->SetInternalFieldCount(1);
-  ctor->SetClassName(Nan::New("BFMatcher").ToLocalChecked());
+  instanceTemplate->SetInternalFieldCount(1);
+
+  // ctor->SetClassName(Nan::New("BFMatcher").ToLocalChecked());
+  ctor->SetClassName(FF_NEW_STRING("BFMatcher"));
 
-	Nan::SetAccessor(ctor->InstanceTemplate(), Nan::New("normType").ToLocalChecked(), GetNormType);
-  Nan::SetAccessor(ctor->InstanceTemplate(), Nan::New("crossCheck").ToLocalChecked(), GetCrossCheck);
 
-  target->Set(Nan::New("BFMatcher").ToLocalChecked(), ctor->GetFunction());
+	Nan::SetAccessor(instanceTemplate, Nan::New("normType").ToLocalChecked(), BFMatcher::GetNormType);
+  Nan::SetAccessor(instanceTemplate, Nan::New("crossCheck").ToLocalChecked(), BFMatcher::GetCrossCheck);
+
+  //  target->Set(Nan::New("BFMatcher").ToLocalChecked(), ctor->GetFunction());
+  target->Set(FF_NEW_STRING("CascadeClassifier"), ctor->GetFunction());
 };
 
 NAN_METHOD(BFMatcher::New) {
 	FF_METHOD_CONTEXT("BFMatcher::New");
 	BFMatcher* self = new BFMatcher();
-  if (info.Length() > 0) {
-		FF_ARG_INT(0, int normType);
-		FF_ARG_INT(1, bool crossCheck);
 
-		self->bfmatcher = cv::BFMatcher(normType, crossCheck);
-  }
-	self->Wrap(info.Holder());
-  info.GetReturnValue().Set(info.Holder());
-}
+    // optional args
+    bool hasOptArgsObj = FF_HAS_ARG(0) && info[0]->IsObject();
+    FF_OBJ optArgs = hasOptArgsObj ? info[0]->ToObject() : FF_NEW_OBJ();
+
+	FF_GET_NUMBER_IFDEF(optArgs, double normType, "normType", cv::NORM_L2);
+		FF_GET_BOOL_IFDEF(optArgs, bool crossCheck, "crossCheck", false);
 
-NAN_METHOD(BFMatcher::Clone) {
-  GaussianBlurWorker worker(Mat::Converter::unwrap(info.This()));
-  FF_WORKER_SYNC("Mat::GaussianBlur", worker);
-  info.GetReturnValue().Set(worker.getReturnValue());
+	if (!hasOptArgsObj) {
+		FF_ARG_NUMBER_IFDEF(0, normType, normType);
+		FF_ARG_INT_IFDEF(1, crossCheck, crossCheck);
+	}
+
+	self->Wrap(info.Holder());
+	self->bfmatcher = cv::BFMatcher::create(
+		normType,
+		crossCheck
+	);
+  FF_RETURN(info.Holder());
 }

cc/modules/features2d/BFMatcher.h

@@ -7,18 +7,21 @@
 
 class BFMatcher : public Nan::ObjectWrap {
 public:
-    cv::BFMatcher BFMatcher;
+    cv::BFMatcher bfmatcher;
+
+	int normType;
+	bool crossCheck;
 
 	static NAN_MODULE_INIT(Init);
 	static NAN_METHOD(New);
 
-	static FF_GETTER(BFMatcher, GetNormType, bfmatcher.normType)
-	static FF_GETTER(BFMatcher, GetCrossCheck, bfmatcher.crossCheck)
+	static FF_GETTER(BFMatcher, GetNormType, normType)
+	static FF_GETTER(BFMatcher, GetCrossCheck, crossCheck)
 
   static Nan::Persistent<v8::FunctionTemplate> constructor;
 
-	cv::DMatch* getNativeObjectPtr() { return &bfmatcher; }
-	cv::DMatch getNativeObject() { return bfmatcher; }
+	cv::BFMatcher* getNativeObjectPtr() { return &bfmatcher; }
+	cv::BFMatcher getNativeObject() { return bfmatcher; }
 
 	typedef InstanceConverter<BFMatcher, cv::BFMatcher> Converter;
 
@@ -31,7 +34,6 @@ class BFMatcher : public Nan::ObjectWrap {
     static const char* getClassName() {
         return "BFMatcher";
     }
-
-}
+};
 
 #endif