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

Commit ddf42d1

Browse files
committed
detect_thresh only works on OpenCV >= 3.3
1 parent d5d94a8 commit ddf42d1

File tree

2 files changed

+9
-4
lines changed

2 files changed

+9
-4
lines changed

cc/modules/tracking/Trackers/TrackerKCFParams.cc

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ NAN_MODULE_INIT(TrackerKCFParams::Init) {
1919
Nan::SetAccessor(instanceTemplate, FF_NEW_STRING("interp_factor"), interp_factorGet, interp_factorSet);
2020
Nan::SetAccessor(instanceTemplate, FF_NEW_STRING("output_sigma_factor"), output_sigma_factorGet, output_sigma_factorSet);
2121
Nan::SetAccessor(instanceTemplate, FF_NEW_STRING("pca_learning_rate"), pca_learning_rateGet, pca_learning_rateSet);
22-
Nan::SetAccessor(instanceTemplate, FF_NEW_STRING("detect_thresh"), detect_threshGet, detect_threshSet);
2322
Nan::SetAccessor(instanceTemplate, FF_NEW_STRING("resize"), resizeGet, resizeSet);
2423
Nan::SetAccessor(instanceTemplate, FF_NEW_STRING("split_coeff"), split_coeffGet, split_coeffSet);
2524
Nan::SetAccessor(instanceTemplate, FF_NEW_STRING("wrap_kernel"), wrap_kernelGet, wrap_kernelSet);
@@ -28,7 +27,9 @@ NAN_MODULE_INIT(TrackerKCFParams::Init) {
2827
Nan::SetAccessor(instanceTemplate, FF_NEW_STRING("compressed_size"), compressed_sizeGet, compressed_sizeSet);
2928
Nan::SetAccessor(instanceTemplate, FF_NEW_STRING("desc_pca"), desc_pcaGet, desc_pcaSet);
3029
Nan::SetAccessor(instanceTemplate, FF_NEW_STRING("desc_npca"), desc_npcaGet, desc_npcaSet);
31-
30+
#if CV_MINOR_VERSION > 2
31+
Nan::SetAccessor(instanceTemplate, FF_NEW_STRING("detect_thresh"), detect_threshGet, detect_threshSet);
32+
#endif
3233
target->Set(FF_NEW_STRING("TrackerKCFParams"), ctor->GetFunction());
3334
};
3435

cc/modules/tracking/Trackers/TrackerKCFParams.h

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,7 @@ class TrackerKCFParams : public Nan::ObjectWrap {
2323
static FF_SETTER_NUMBER(TrackerKCFParams, output_sigma_factor, params.output_sigma_factor);
2424
static FF_GETTER(TrackerKCFParams, pca_learning_rateGet, params.pca_learning_rate);
2525
static FF_SETTER_NUMBER(TrackerKCFParams, pca_learning_rate, params.pca_learning_rate);
26-
static FF_GETTER(TrackerKCFParams, detect_threshGet, params.detect_thresh);
27-
static FF_SETTER_NUMBER(TrackerKCFParams, detect_thresh, params.detect_thresh);
26+
2827
static FF_GETTER(TrackerKCFParams, resizeGet, params.resize);
2928
static FF_SETTER_BOOL(TrackerKCFParams, resize, params.resize);
3029
static FF_GETTER(TrackerKCFParams, split_coeffGet, params.split_coeff);
@@ -41,6 +40,11 @@ class TrackerKCFParams : public Nan::ObjectWrap {
4140
static FF_SETTER_UINT(TrackerKCFParams, desc_pca, params.desc_pca);
4241
static FF_GETTER(TrackerKCFParams, desc_npcaGet, params.desc_npca);
4342
static FF_SETTER_UINT(TrackerKCFParams, desc_npca, params.desc_npca);
43+
44+
#if CV_MINOR_VERSION > 2
45+
static FF_GETTER(TrackerKCFParams, detect_threshGet, params.detect_thresh);
46+
static FF_SETTER_NUMBER(TrackerKCFParams, detect_thresh, params.detect_thresh);
47+
#endif
4448

4549
static Nan::Persistent<v8::FunctionTemplate> constructor;
4650
};

0 commit comments

Comments
 (0)