Facemark API fix build for older contrib versions

justadudewhohacks · Apr 24, 2018 · 8d04229 · 8d04229
1 parent 4920f5c
commit 8d04229
Show file tree

Hide file tree

Showing 13 changed files with 54 additions and 1 deletion.
diff --git a/cc/modules/face/Facemark.cc b/cc/modules/face/Facemark.cc
@@ -3,6 +3,8 @@
 #include "Facemark.h"
 #include "FacemarkBindings.h"
 
+#if CV_VERSION_MINOR >= 4
+
 NAN_METHOD(Facemark::Save) {
   FF_METHOD_CONTEXT("Facemark::Save");
   FF_ARG_STRING(0, std::string path);
@@ -168,3 +170,5 @@ bool Facemark::detector(cv::InputArray image, cv::OutputArray faces,
 }
 
 #endif
+
+#endif
diff --git a/cc/modules/face/Facemark.h b/cc/modules/face/Facemark.h
@@ -6,6 +6,8 @@
 #include <iostream>
 #include <opencv2/face.hpp>
 
+#if CV_VERSION_MINOR >= 4
+
 #ifndef __FF_FACEMARK_H__
 #define __FF_FACEMARK_H__
 
@@ -16,7 +18,7 @@ class Facemark : public Nan::ObjectWrap {
   virtual void load(std::string) = 0;
 
   static void Init(v8::Local<v8::FunctionTemplate>);
-  
+
   static NAN_METHOD(AddTrainingSample);
   static NAN_METHOD(AddTrainingSampleAsync);
   static NAN_METHOD(LoadModel);
@@ -38,3 +40,5 @@ class Facemark : public Nan::ObjectWrap {
 };
 
 #endif
+
+#endif
diff --git a/cc/modules/face/FacemarkAAM.cc b/cc/modules/face/FacemarkAAM.cc
@@ -3,6 +3,8 @@
 #include "FacemarkAAM.h"
 #include "FacemarkAAMParams.h"
 
+#if CV_VERSION_MINOR >= 4
+
 Nan::Persistent<v8::FunctionTemplate> FacemarkAAM::constructor;
 
 NAN_MODULE_INIT(FacemarkAAM::Init) {
@@ -37,3 +39,5 @@ NAN_METHOD(FacemarkAAM::New) {
 };
 
 #endif
+
+#endif
diff --git a/cc/modules/face/FacemarkAAM.h b/cc/modules/face/FacemarkAAM.h
@@ -1,5 +1,7 @@
 #include "Facemark.h"
 
+#if CV_VERSION_MINOR >= 4
+
 #ifndef __FF_FACEMARKAAM_H__
 #define __FF_FACEMARKAAM_H__
 
@@ -21,3 +23,5 @@ class FacemarkAAM : public Facemark {
 };
 
 #endif
+
+#endif
diff --git a/cc/modules/face/FacemarkAAMData.cc b/cc/modules/face/FacemarkAAMData.cc
@@ -2,6 +2,8 @@
 
 #include "FacemarkAAMData.h"
 
+#if CV_VERSION_MINOR >= 4
+
 Nan::Persistent<v8::FunctionTemplate> FacemarkAAMData::constructor;
 
 NAN_MODULE_INIT(FacemarkAAMData::Init) {
@@ -27,3 +29,5 @@ NAN_METHOD(FacemarkAAMData::New) {
 };
 
 #endif
+
+#endif
diff --git a/cc/modules/face/FacemarkAAMData.h b/cc/modules/face/FacemarkAAMData.h
@@ -4,6 +4,8 @@
 #include <opencv2/core.hpp>
 #include <opencv2/face.hpp>
 
+#if CV_VERSION_MINOR >= 4
+
 #ifndef __FF_FACEMARKAAMDATA_H__
 #define __FF_FACEMARKAAMDATA_H__
 
@@ -30,3 +32,5 @@ class FacemarkAAMData : public Nan::ObjectWrap {
   FF_UNWRAP_FACEMARKAAMDATA(obj)->data
 
 #endif
+
+#endif
diff --git a/cc/modules/face/FacemarkAAMParams.cc b/cc/modules/face/FacemarkAAMParams.cc
@@ -2,6 +2,8 @@
 
 #include "FacemarkAAMParams.h"
 
+#if CV_VERSION_MINOR >= 4
+
 Nan::Persistent<v8::FunctionTemplate> FacemarkAAMParams::constructor;
 
 NAN_MODULE_INIT(FacemarkAAMParams::Init) {
@@ -36,3 +38,5 @@ NAN_METHOD(FacemarkAAMParams::New) {
 };
 
 #endif
+
+#endif
diff --git a/cc/modules/face/FacemarkAAMParams.h b/cc/modules/face/FacemarkAAMParams.h
@@ -2,6 +2,8 @@
 #include "TypeConverters.h"
 #include <opencv2/face.hpp>
 
+#if CV_VERSION_MINOR >= 4
+
 #ifndef __FF_FACEMARKAAMPARAMS_H__
 #define __FF_FACEMARKAAMPARAMS_H__
 
@@ -41,3 +43,5 @@ class FacemarkAAMParams : public Nan::ObjectWrap {
   FF_UNWRAP_FACEMARKAAMPARAMS(obj)->params
 
 #endif
+
+#endif
diff --git a/cc/modules/face/FacemarkBindings.h b/cc/modules/face/FacemarkBindings.h
@@ -1,6 +1,8 @@
 #include "Facemark.h"
 #include "FacemarkAAMData.h"
 
+#if CV_VERSION_MINOR >= 4
+
 #ifndef __FF_FACEMARKBINDINGS_H_
 #define __FF_FACEMARKBINDINGS_H_
 
@@ -130,4 +132,7 @@ namespace FacemarkBindings {
     }
   };
 }
+
+#endif
+
 #endif
diff --git a/cc/modules/face/FacemarkLBF.cc b/cc/modules/face/FacemarkLBF.cc
@@ -3,6 +3,8 @@
 #include "FacemarkLBF.h"
 #include "FacemarkLBFParams.h"
 
+#if CV_VERSION_MINOR >= 4
+
 Nan::Persistent<v8::FunctionTemplate> FacemarkLBF::constructor;
 
 NAN_MODULE_INIT(FacemarkLBF::Init) {
@@ -37,3 +39,5 @@ NAN_METHOD(FacemarkLBF::New) {
 };
 
 #endif
+
+#endif
diff --git a/cc/modules/face/FacemarkLBF.h b/cc/modules/face/FacemarkLBF.h
@@ -1,5 +1,7 @@
 #include "Facemark.h"
 
+#if CV_VERSION_MINOR >= 4
+
 #ifndef __FF_FACEMARKLBF_H__
 #define __FF_FACEMARKLBF_H__
 
@@ -21,3 +23,5 @@ class FacemarkLBF : public Facemark {
 };
 
 #endif
+
+#endif
diff --git a/cc/modules/face/FacemarkLBFParams.cc b/cc/modules/face/FacemarkLBFParams.cc
@@ -2,6 +2,8 @@
 
 #include "FacemarkLBFParams.h"
 
+#if CV_VERSION_MINOR >= 4
+
 Nan::Persistent<v8::FunctionTemplate> FacemarkLBFParams::constructor;
 
 NAN_MODULE_INIT(FacemarkLBFParams::Init) {
@@ -42,3 +44,5 @@ NAN_METHOD(FacemarkLBFParams::New) {
 };
 
 #endif
+
+#endif
diff --git a/cc/modules/face/FacemarkLBFParams.h b/cc/modules/face/FacemarkLBFParams.h
@@ -4,6 +4,8 @@
 #include "Rect.h"
 #include <opencv2/face.hpp>
 
+#if CV_VERSION_MINOR >= 4
+
 #ifndef __FF_FACEMARKLBFPARAMS_H__
 #define __FF_FACEMARKLBFPARAMS_H__
 
@@ -77,3 +79,5 @@ class FacemarkLBFParams : public Nan::ObjectWrap {
   FF_UNWRAP_FACEMARKLBFPARAMS(obj)->params
 
 #endif
+
+#endif