add support to Opencv4.5.2

Author: wandenberg

.travis.yml

@@ -10,7 +10,7 @@ env:
     - OPENCV4NODEJS_DISABLE_AUTOBUILD=1
     - LATEST_STABLE_NODEJS_VERSION=12
     - OPENCV3_LATEST=3.4.6
-    - OPENCV4_LATEST=4.4.0
+    - OPENCV4_LATEST=4.5.2
 
 matrix:
   include:

appveyor.yml

@@ -15,7 +15,7 @@ init:
 # what combinations to test
 environment:
   OPENCV3_LATEST: 3.4.6
-  OPENCV4_LATEST: 4.4.0
+  OPENCV4_LATEST: 4.5.2
   PYTHON_VERSION: 2.7
   PYTHON: "C:\\Python27-x64"
   # use self build

cc/tracking/MultiTracker.cc

@@ -36,7 +36,11 @@ NAN_METHOD(MultiTracker::New) {
 	FF::TryCatch tryCatch("MultiTracker::New");
 	FF_ASSERT_CONSTRUCT_CALL();
 	MultiTracker* self = new MultiTracker();
+#if CV_VERSION_GREATER_EQUAL(4, 5, 2)
+	self->setNativeObject(cv::makePtr<cv::legacy::MultiTracker>());
+#else
 	self->setNativeObject(cv::makePtr<cv::MultiTracker>());
+#endif
 	self->Wrap(info.Holder());
 	info.GetReturnValue().Set(info.Holder());
 };
@@ -51,7 +55,9 @@ NAN_METHOD(MultiTracker::AddMIL) {
 	) {
 		return tryCatch.reThrow();
 	}
-#if CV_VERSION_GREATER_EQUAL(3, 3, 0)
+#if CV_VERSION_GREATER_EQUAL(4, 5, 2)
+	cv::Ptr<cv::legacy::Tracker> type = cv::legacy::TrackerMIL::create();
+#elif CV_VERSION_GREATER_EQUAL(3, 3, 0)
 	cv::Ptr<cv::Tracker> type = cv::TrackerMIL::create();
 #else
 	const std::string type("MIL");
@@ -70,7 +76,9 @@ NAN_METHOD(MultiTracker::AddBOOSTING) {
 		) {
 		return tryCatch.reThrow();
 	}
-#if CV_VERSION_GREATER_EQUAL(3, 3, 0)
+#if CV_VERSION_GREATER_EQUAL(4, 5, 2)
+	cv::Ptr<cv::legacy::Tracker> type = cv::legacy::TrackerBoosting::create();
+#elif CV_VERSION_GREATER_EQUAL(3, 3, 0)
 	cv::Ptr<cv::Tracker> type = cv::TrackerBoosting::create();
 #else
 	const std::string type("BOOSTING");
@@ -89,7 +97,9 @@ NAN_METHOD(MultiTracker::AddMEDIANFLOW) {
 		) {
 		return tryCatch.reThrow();
 	}
-#if CV_VERSION_GREATER_EQUAL(3, 3, 0)
+#if CV_VERSION_GREATER_EQUAL(4, 5, 2)
+	cv::Ptr<cv::legacy::Tracker> type = cv::legacy::TrackerMedianFlow::create();
+#elif CV_VERSION_GREATER_EQUAL(3, 3, 0)
 	cv::Ptr<cv::Tracker> type = cv::TrackerMedianFlow::create();
 #else
 	const std::string type("MEDIANFLOW");
@@ -108,7 +118,9 @@ NAN_METHOD(MultiTracker::AddTLD) {
 		) {
 		return tryCatch.reThrow();
 	}
-#if CV_VERSION_GREATER_EQUAL(3, 3, 0)
+#if CV_VERSION_GREATER_EQUAL(4, 5, 2)
+	cv::Ptr<cv::legacy::Tracker> type = cv::legacy::TrackerTLD::create();
+#elif CV_VERSION_GREATER_EQUAL(3, 3, 0)
 	cv::Ptr<cv::Tracker> type = cv::TrackerTLD::create();
 #else
 	const std::string type("TLD");
@@ -127,7 +139,9 @@ NAN_METHOD(MultiTracker::AddKCF) {
 		) {
 		return tryCatch.reThrow();
 	}
-#if CV_VERSION_GREATER_EQUAL(3, 3, 0)
+#if CV_VERSION_GREATER_EQUAL(4, 5, 2)
+	cv::Ptr<cv::legacy::Tracker> type = cv::legacy::TrackerKCF::create();
+#elif CV_VERSION_GREATER_EQUAL(3, 3, 0)
 	cv::Ptr<cv::Tracker> type = cv::TrackerKCF::create();
 #else
 	const std::string type("KCF");
@@ -159,7 +173,11 @@ NAN_METHOD(MultiTracker::AddMOSSE) {
 		) {
 		return tryCatch.reThrow();
 	}
+#if CV_VERSION_GREATER_EQUAL(4, 5, 2)
+	cv::Ptr<cv::legacy::Tracker> type = cv::legacy::TrackerMOSSE::create();
+#else
 	cv::Ptr<cv::Tracker> type = cv::TrackerMOSSE::create();
+#endif
 	bool ret = MultiTracker::unwrapSelf(info)->add(type, image, boundingBox);
 	info.GetReturnValue().Set(Nan::New(ret));
 }
@@ -177,7 +195,11 @@ NAN_METHOD(MultiTracker::AddCSRT) {
 		) {
 		return tryCatch.reThrow();
 	}
+#if CV_VERSION_GREATER_EQUAL(4, 5, 2)
+	cv::Ptr<cv::legacy::Tracker> type = cv::legacy::TrackerCSRT::create();
+#else
 	cv::Ptr<cv::Tracker> type = cv::TrackerCSRT::create();
+#endif
 	bool ret = MultiTracker::unwrapSelf(info)->add(type, image, boundingBox);
 	info.GetReturnValue().Set(Nan::New(ret));
 }

cc/tracking/MultiTracker.h

@@ -1,5 +1,8 @@
 #include "macros.h"
 #include <opencv2/tracking.hpp>
+#if CV_VERSION_GREATER_EQUAL(4, 5, 2)
+#include <opencv2/tracking/tracking_legacy.hpp>
+#endif
 #include "Mat.h"
 #include "Rect.h"
 
@@ -8,7 +11,11 @@
 #ifndef __FF_MULTITRACKER_H__
 #define __FF_MULTITRACKER_H__
 
+#if CV_VERSION_GREATER_EQUAL(4, 5, 2)
+class MultiTracker : public FF::ObjectWrap<MultiTracker, cv::Ptr<cv::legacy::MultiTracker>> {
+#else
 class MultiTracker : public FF::ObjectWrap<MultiTracker, cv::Ptr<cv::MultiTracker>> {
+#endif
 public:
 	static Nan::Persistent<v8::FunctionTemplate> constructor;
 
@@ -31,4 +38,4 @@ class MultiTracker : public FF::ObjectWrap<MultiTracker, cv::Ptr<cv::MultiTracke
 
 #endif
 
-#endif
+#endif

cc/tracking/Tracker.h

@@ -1,5 +1,8 @@
 #include "macros.h"
 #include <opencv2/tracking.hpp>
+#if CV_VERSION_GREATER_EQUAL(4, 5, 2)
+#include <opencv2/tracking/tracking_legacy.hpp>
+#endif
 #include "Mat.h"
 #include "Rect.h"
 
@@ -8,7 +11,11 @@
 
 class Tracker : public FF::ObjectWrapBase<Tracker>, public Nan::ObjectWrap {
 public:
+#if CV_VERSION_GREATER_EQUAL(4, 5, 2)
+	virtual cv::Ptr<cv::legacy::Tracker> getTracker() = 0;
+#else
 	virtual cv::Ptr<cv::Tracker> getTracker() = 0;
+#endif
 
 	static void Init(v8::Local<v8::FunctionTemplate>);
 
@@ -18,4 +25,4 @@ class Tracker : public FF::ObjectWrapBase<Tracker>, public Nan::ObjectWrap {
 	static NAN_METHOD(GetModel);
 };
 
-#endif
+#endif

cc/tracking/Trackers/TrackerBoosting.cc

@@ -26,13 +26,19 @@ NAN_METHOD(TrackerBoosting::New) {
 	FF::TryCatch tryCatch("TrackerBoosting::New");
 	FF_ASSERT_CONSTRUCT_CALL();
 
+#if CV_VERSION_GREATER_EQUAL(4, 5, 2)
+	cv::legacy::TrackerBoosting::Params params;
+#else
 	cv::TrackerBoosting::Params params;
+#endif
 	if (TrackerBoostingParams::Converter::optArg(0, &params, info)) {
 		return tryCatch.reThrow();
 	}
 
 	TrackerBoosting* self = new TrackerBoosting();
-#if CV_VERSION_GREATER_EQUAL(3, 3, 0)
+#if CV_VERSION_GREATER_EQUAL(4, 5, 2)
+	self->tracker = cv::legacy::TrackerBoosting::create(params);
+#elif CV_VERSION_GREATER_EQUAL(3, 3, 0)
 	self->tracker = cv::TrackerBoosting::create(params);
 #else
 	self->tracker = cv::TrackerBoosting::createTracker(params);

cc/tracking/Trackers/TrackerBoosting.h

@@ -5,16 +5,24 @@
 
 class TrackerBoosting : public Tracker {
 public:
+#if CV_VERSION_GREATER_EQUAL(4, 5, 2)
+	cv::Ptr<cv::legacy::TrackerBoosting> tracker;
+#else
 	cv::Ptr<cv::TrackerBoosting> tracker;
+#endif
 
   static NAN_MODULE_INIT(Init);
   static NAN_METHOD(New);
 
 	static Nan::Persistent<v8::FunctionTemplate> constructor;
 
+#if CV_VERSION_GREATER_EQUAL(4, 5, 2)
+	cv::Ptr<cv::legacy::Tracker> getTracker() {
+#else
 	cv::Ptr<cv::Tracker> getTracker() {
+#endif
 		return tracker;
 	}
 };
 
-#endif
+#endif

cc/tracking/Trackers/TrackerBoostingParams.cc

@@ -28,7 +28,11 @@ NAN_METHOD(TrackerBoostingParams::New) {
 	FF::TryCatch tryCatch("TrackerBoostingParams::New");
 	FF_ASSERT_CONSTRUCT_CALL();
 	TrackerBoostingParams* self = new TrackerBoostingParams();
+#if CV_VERSION_GREATER_EQUAL(4, 5, 2)
+	self->self = cv::legacy::TrackerBoosting::Params();
+#else
 	self->self = cv::TrackerBoosting::Params();
+#endif
 	self->Wrap(info.Holder());
 	info.GetReturnValue().Set(info.Holder());
 };

cc/tracking/Trackers/TrackerBoostingParams.h

@@ -1,10 +1,17 @@
 #include "macros.h"
 #include <opencv2/tracking.hpp>
+#if CV_VERSION_GREATER_EQUAL(4, 5, 2)
+#include <opencv2/tracking/tracking_legacy.hpp>
+#endif
 
 #ifndef __FF_TRACKERBOOSTINGPARAMS_H__
 #define __FF_TRACKERBOOSTINGPARAMS_H__
 
+#if CV_VERSION_GREATER_EQUAL(4, 5, 2)
+class TrackerBoostingParams : public FF::ObjectWrap<TrackerBoostingParams, cv::legacy::TrackerBoosting::Params> {
+#else
 class TrackerBoostingParams : public FF::ObjectWrap<TrackerBoostingParams, cv::TrackerBoosting::Params> {
+#endif
 public:
 	static Nan::Persistent<v8::FunctionTemplate> constructor;
 
@@ -22,4 +29,4 @@ class TrackerBoostingParams : public FF::ObjectWrap<TrackerBoostingParams, cv::T
 	FF_ACCESSORS(featureSetNumFeatures, FF::IntConverter);
 };
 
-#endif
+#endif

cc/tracking/Trackers/TrackerCSRT.cc

@@ -28,13 +28,21 @@ NAN_METHOD(TrackerCSRT::New) {
 	FF::TryCatch tryCatch("TrackerCSRT::New");
 	FF_ASSERT_CONSTRUCT_CALL();
 
+#if CV_VERSION_GREATER_EQUAL(4, 5, 2)
+	cv::legacy::TrackerCSRT::Params params;
+#else
 	cv::TrackerCSRT::Params params;
+#endif
 	if (TrackerCSRTParams::Converter::optArg(0, &params, info)) {
 		return tryCatch.reThrow();
 	}
 
 	TrackerCSRT* self = new TrackerCSRT();
+#if CV_VERSION_GREATER_EQUAL(4, 5, 2)
+	self->tracker = cv::legacy::TrackerCSRT::create(params);
+#else
 	self->tracker = cv::TrackerCSRT::create(params);
+#endif
 	self->Wrap(info.Holder());
 	info.GetReturnValue().Set(info.Holder());
 };