ADD: BFMatcher to features2d to be detected

Small changes to BFMatcher

Author: eek

cc/modules/features2d/BFMatcher.cc

@@ -6,19 +6,22 @@ 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);
   instanceTemplate->SetInternalFieldCount(1);
 
-  // ctor->SetClassName(Nan::New("BFMatcher").ToLocalChecked());
-  ctor->SetClassName(FF_NEW_STRING("BFMatcher"));
+   ctor->SetClassName(Nan::New("BFMatcher").ToLocalChecked());
+//  ctor->SetClassName(FF_NEW_STRING("BFMatcher"));
 
 
 	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::SetPrototypeMethod(ctor, "create", create);
+
+
+    target->Set(Nan::New("BFMatcher").ToLocalChecked(), ctor->GetFunction());
+//  target->Set(FF_NEW_STRING("BFMatcher"), ctor->GetFunction());
+
 };
 
 NAN_METHOD(BFMatcher::New) {
@@ -29,18 +32,21 @@ NAN_METHOD(BFMatcher::New) {
     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);
+	FF_GET_NUMBER_IFDEF(optArgs, self->normType, "normType", cv::NORM_L2);
+		FF_GET_BOOL_IFDEF(optArgs, self->crossCheck, "crossCheck", false);
 
 	if (!hasOptArgsObj) {
-		FF_ARG_NUMBER_IFDEF(0, normType, normType);
-		FF_ARG_INT_IFDEF(1, crossCheck, crossCheck);
+		FF_ARG_INT_IFDEF(0, self->normType, self->normType);
+		FF_ARG_BOOL_IFDEF(1, self->crossCheck, self->crossCheck);
 	}
 
 	self->Wrap(info.Holder());
-	self->bfmatcher = cv::BFMatcher::create(
-		normType,
-		crossCheck
+	self->bfmatcher = cv::BFMatcher(
+		self->normType,
+		self->crossCheck
 	);
-  FF_RETURN(info.Holder());
+
+  info.GetReturnValue().Set(info.Holder());
 }
+
+

cc/modules/features2d/BFMatcher.h

@@ -2,8 +2,8 @@
 #include "NativeNodeUtils.h"
 #include <opencv2/features2d.hpp>
 
-#ifndef FF_BFMATCHER_H_
-#define FF_BFMATCHER_H_
+#ifndef __FF_BFMATCHER_H__
+#define __FF_BFMATCHER_H__
 
 class BFMatcher : public Nan::ObjectWrap {
 public:
@@ -12,9 +12,6 @@ class BFMatcher : public Nan::ObjectWrap {
 	int normType;
 	bool crossCheck;
 
-	static NAN_MODULE_INIT(Init);
-	static NAN_METHOD(New);
-
 	static FF_GETTER(BFMatcher, GetNormType, normType)
 	static FF_GETTER(BFMatcher, GetCrossCheck, crossCheck)
 
@@ -25,11 +22,14 @@ class BFMatcher : public Nan::ObjectWrap {
 
 	typedef InstanceConverter<BFMatcher, cv::BFMatcher> Converter;
 
-	static NAN_METHOD(Clone);
-	static NAN_METHOD(Create);
-	static NAN_METHOD(IsMaskSupported);
-	static NAN_METHOD(KnnMatchImpl);
-	static NAN_METHOD(RadiusMatchImpl);
+	static NAN_MODULE_INIT(Init);
+
+    static NAN_METHOD(New);
+//	static NAN_METHOD(Clone);
+//	static NAN_METHOD(Create);
+//	static NAN_METHOD(IsMaskSupported);
+//	static NAN_METHOD(KnnMatchImpl);
+//	static NAN_METHOD(RadiusMatchImpl);
 
     static const char* getClassName() {
         return "BFMatcher";

cc/modules/features2d/features2d.cc

@@ -24,6 +24,7 @@ NAN_MODULE_INIT(Features2d::Init) {
 	AGASTDetector::Init(target);
 	AKAZEDetector::Init(target);
 	BRISKDetector::Init(target);
+	BFMatcher::Init(target);
 	FASTDetector::Init(target);
 	GFTTDetector::Init(target);
 	KAZEDetector::Init(target);

package.json

@@ -39,7 +39,7 @@
   "gypfile": true,
   "dependencies": {
     "macro-inferno": "^0.2.1",
-    "nan": "^2.10.0",
+    "nan": "^2.11.0",
     "native-node-utils": "0.1.2",
     "opencv-build": "0.0.14"
   },