Skip to content
This repository was archived by the owner on Oct 18, 2023. It is now read-only.

Commit 8d04229

Browse files
committed
Facemark API fix build for older contrib versions
1 parent 4920f5c commit 8d04229

13 files changed

+54
-1
lines changed

cc/modules/face/Facemark.cc

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
#include "Facemark.h"
44
#include "FacemarkBindings.h"
55

6+
#if CV_VERSION_MINOR >= 4
7+
68
NAN_METHOD(Facemark::Save) {
79
FF_METHOD_CONTEXT("Facemark::Save");
810
FF_ARG_STRING(0, std::string path);
@@ -168,3 +170,5 @@ bool Facemark::detector(cv::InputArray image, cv::OutputArray faces,
168170
}
169171

170172
#endif
173+
174+
#endif

cc/modules/face/Facemark.h

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@
66
#include <iostream>
77
#include <opencv2/face.hpp>
88

9+
#if CV_VERSION_MINOR >= 4
10+
911
#ifndef __FF_FACEMARK_H__
1012
#define __FF_FACEMARK_H__
1113

@@ -16,7 +18,7 @@ class Facemark : public Nan::ObjectWrap {
1618
virtual void load(std::string) = 0;
1719

1820
static void Init(v8::Local<v8::FunctionTemplate>);
19-
21+
2022
static NAN_METHOD(AddTrainingSample);
2123
static NAN_METHOD(AddTrainingSampleAsync);
2224
static NAN_METHOD(LoadModel);
@@ -38,3 +40,5 @@ class Facemark : public Nan::ObjectWrap {
3840
};
3941

4042
#endif
43+
44+
#endif

cc/modules/face/FacemarkAAM.cc

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
#include "FacemarkAAM.h"
44
#include "FacemarkAAMParams.h"
55

6+
#if CV_VERSION_MINOR >= 4
7+
68
Nan::Persistent<v8::FunctionTemplate> FacemarkAAM::constructor;
79

810
NAN_MODULE_INIT(FacemarkAAM::Init) {
@@ -37,3 +39,5 @@ NAN_METHOD(FacemarkAAM::New) {
3739
};
3840

3941
#endif
42+
43+
#endif

cc/modules/face/FacemarkAAM.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
#include "Facemark.h"
22

3+
#if CV_VERSION_MINOR >= 4
4+
35
#ifndef __FF_FACEMARKAAM_H__
46
#define __FF_FACEMARKAAM_H__
57

@@ -21,3 +23,5 @@ class FacemarkAAM : public Facemark {
2123
};
2224

2325
#endif
26+
27+
#endif

cc/modules/face/FacemarkAAMData.cc

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22

33
#include "FacemarkAAMData.h"
44

5+
#if CV_VERSION_MINOR >= 4
6+
57
Nan::Persistent<v8::FunctionTemplate> FacemarkAAMData::constructor;
68

79
NAN_MODULE_INIT(FacemarkAAMData::Init) {
@@ -27,3 +29,5 @@ NAN_METHOD(FacemarkAAMData::New) {
2729
};
2830

2931
#endif
32+
33+
#endif

cc/modules/face/FacemarkAAMData.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44
#include <opencv2/core.hpp>
55
#include <opencv2/face.hpp>
66

7+
#if CV_VERSION_MINOR >= 4
8+
79
#ifndef __FF_FACEMARKAAMDATA_H__
810
#define __FF_FACEMARKAAMDATA_H__
911

@@ -30,3 +32,5 @@ class FacemarkAAMData : public Nan::ObjectWrap {
3032
FF_UNWRAP_FACEMARKAAMDATA(obj)->data
3133

3234
#endif
35+
36+
#endif

cc/modules/face/FacemarkAAMParams.cc

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22

33
#include "FacemarkAAMParams.h"
44

5+
#if CV_VERSION_MINOR >= 4
6+
57
Nan::Persistent<v8::FunctionTemplate> FacemarkAAMParams::constructor;
68

79
NAN_MODULE_INIT(FacemarkAAMParams::Init) {
@@ -36,3 +38,5 @@ NAN_METHOD(FacemarkAAMParams::New) {
3638
};
3739

3840
#endif
41+
42+
#endif

cc/modules/face/FacemarkAAMParams.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22
#include "TypeConverters.h"
33
#include <opencv2/face.hpp>
44

5+
#if CV_VERSION_MINOR >= 4
6+
57
#ifndef __FF_FACEMARKAAMPARAMS_H__
68
#define __FF_FACEMARKAAMPARAMS_H__
79

@@ -41,3 +43,5 @@ class FacemarkAAMParams : public Nan::ObjectWrap {
4143
FF_UNWRAP_FACEMARKAAMPARAMS(obj)->params
4244

4345
#endif
46+
47+
#endif

cc/modules/face/FacemarkBindings.h

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
#include "Facemark.h"
22
#include "FacemarkAAMData.h"
33

4+
#if CV_VERSION_MINOR >= 4
5+
46
#ifndef __FF_FACEMARKBINDINGS_H_
57
#define __FF_FACEMARKBINDINGS_H_
68

@@ -130,4 +132,7 @@ namespace FacemarkBindings {
130132
}
131133
};
132134
}
135+
136+
#endif
137+
133138
#endif

cc/modules/face/FacemarkLBF.cc

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
#include "FacemarkLBF.h"
44
#include "FacemarkLBFParams.h"
55

6+
#if CV_VERSION_MINOR >= 4
7+
68
Nan::Persistent<v8::FunctionTemplate> FacemarkLBF::constructor;
79

810
NAN_MODULE_INIT(FacemarkLBF::Init) {
@@ -37,3 +39,5 @@ NAN_METHOD(FacemarkLBF::New) {
3739
};
3840

3941
#endif
42+
43+
#endif

0 commit comments

Comments
 (0)