Skip to content
Snippets Groups Projects
Commit f65078c6 authored by Andrews Sobral's avatar Andrews Sobral
Browse files

fixed macro preprocessor for GMG method

parent ea26e21f
Branches
Tags
No related merge requests found
...@@ -60,7 +60,7 @@ namespace bgslibrary ...@@ -60,7 +60,7 @@ namespace bgslibrary
if (enableAdaptiveBackgroundLearning) if (enableAdaptiveBackgroundLearning)
adaptiveBackgroundLearning = new AdaptiveBackgroundLearning; adaptiveBackgroundLearning = new AdaptiveBackgroundLearning;
#if CV_MAJOR_VERSION >= 2 && CV_MINOR_VERSION >= 4 && CV_SUBMINOR_VERSION >= 3 #if CV_MAJOR_VERSION == 2 && CV_MINOR_VERSION >= 4 && CV_SUBMINOR_VERSION >= 3
if (enableGMG) if (enableGMG)
gmg = new GMG; gmg = new GMG;
#endif #endif
...@@ -215,7 +215,7 @@ namespace bgslibrary ...@@ -215,7 +215,7 @@ namespace bgslibrary
if (enableAdaptiveBackgroundLearning) if (enableAdaptiveBackgroundLearning)
process("AdaptiveBackgroundLearning", adaptiveBackgroundLearning, img_preProcessor, img_adaptiveBackgroundLearning); process("AdaptiveBackgroundLearning", adaptiveBackgroundLearning, img_preProcessor, img_adaptiveBackgroundLearning);
#if CV_MAJOR_VERSION >= 2 && CV_MINOR_VERSION >= 4 && CV_SUBMINOR_VERSION >= 3 #if CV_MAJOR_VERSION == 2 && CV_MINOR_VERSION >= 4 && CV_SUBMINOR_VERSION >= 3
if (enableGMG) if (enableGMG)
process("GMG", gmg, img_preProcessor, img_gmg); process("GMG", gmg, img_preProcessor, img_gmg);
#endif #endif
...@@ -342,7 +342,7 @@ namespace bgslibrary ...@@ -342,7 +342,7 @@ namespace bgslibrary
#endif #endif
foregroundMaskAnalysis->process(frameNumber, "MixtureOfGaussianV2", img_mixtureOfGaussianV2); foregroundMaskAnalysis->process(frameNumber, "MixtureOfGaussianV2", img_mixtureOfGaussianV2);
foregroundMaskAnalysis->process(frameNumber, "AdaptiveBackgroundLearning", img_adaptiveBackgroundLearning); foregroundMaskAnalysis->process(frameNumber, "AdaptiveBackgroundLearning", img_adaptiveBackgroundLearning);
#if CV_MAJOR_VERSION >= 2 && CV_MINOR_VERSION >= 4 && CV_SUBMINOR_VERSION >= 3 #if CV_MAJOR_VERSION == 2 && CV_MINOR_VERSION >= 4 && CV_SUBMINOR_VERSION >= 3
foregroundMaskAnalysis->process(frameNumber, "GMG", img_gmg); foregroundMaskAnalysis->process(frameNumber, "GMG", img_gmg);
#endif #endif
#if CV_MAJOR_VERSION >= 3 #if CV_MAJOR_VERSION >= 3
...@@ -508,7 +508,7 @@ namespace bgslibrary ...@@ -508,7 +508,7 @@ namespace bgslibrary
if (enableDPAdaptiveMedian) if (enableDPAdaptiveMedian)
delete dpAdaptiveMedian; delete dpAdaptiveMedian;
#if CV_MAJOR_VERSION >= 2 && CV_MINOR_VERSION >= 4 && CV_SUBMINOR_VERSION >= 3 #if CV_MAJOR_VERSION == 2 && CV_MINOR_VERSION >= 4 && CV_SUBMINOR_VERSION >= 3
if (enableGMG) if (enableGMG)
delete gmg; delete gmg;
#endif #endif
...@@ -576,7 +576,7 @@ namespace bgslibrary ...@@ -576,7 +576,7 @@ namespace bgslibrary
#endif #endif
cvWriteInt(fs, "enableMixtureOfGaussianV2", enableMixtureOfGaussianV2); cvWriteInt(fs, "enableMixtureOfGaussianV2", enableMixtureOfGaussianV2);
cvWriteInt(fs, "enableAdaptiveBackgroundLearning", enableAdaptiveBackgroundLearning); cvWriteInt(fs, "enableAdaptiveBackgroundLearning", enableAdaptiveBackgroundLearning);
#if CV_MAJOR_VERSION >= 2 && CV_MINOR_VERSION >= 4 && CV_SUBMINOR_VERSION >= 3 #if CV_MAJOR_VERSION == 2 && CV_MINOR_VERSION >= 4 && CV_SUBMINOR_VERSION >= 3
cvWriteInt(fs, "enableGMG", enableGMG); cvWriteInt(fs, "enableGMG", enableGMG);
#endif #endif
#if CV_MAJOR_VERSION >= 3 #if CV_MAJOR_VERSION >= 3
...@@ -642,7 +642,7 @@ namespace bgslibrary ...@@ -642,7 +642,7 @@ namespace bgslibrary
#endif #endif
enableMixtureOfGaussianV2 = cvReadIntByName(fs, 0, "enableMixtureOfGaussianV2", false); enableMixtureOfGaussianV2 = cvReadIntByName(fs, 0, "enableMixtureOfGaussianV2", false);
enableAdaptiveBackgroundLearning = cvReadIntByName(fs, 0, "enableAdaptiveBackgroundLearning", false); enableAdaptiveBackgroundLearning = cvReadIntByName(fs, 0, "enableAdaptiveBackgroundLearning", false);
#if CV_MAJOR_VERSION >= 2 && CV_MINOR_VERSION >= 4 && CV_SUBMINOR_VERSION >= 3 #if CV_MAJOR_VERSION == 2 && CV_MINOR_VERSION >= 4 && CV_SUBMINOR_VERSION >= 3
enableGMG = cvReadIntByName(fs, 0, "enableGMG", false); enableGMG = cvReadIntByName(fs, 0, "enableGMG", false);
#endif #endif
#if CV_MAJOR_VERSION >= 3 #if CV_MAJOR_VERSION >= 3
......
...@@ -69,7 +69,7 @@ namespace bgslibrary ...@@ -69,7 +69,7 @@ namespace bgslibrary
AdaptiveBackgroundLearning* adaptiveBackgroundLearning; AdaptiveBackgroundLearning* adaptiveBackgroundLearning;
bool enableAdaptiveBackgroundLearning; bool enableAdaptiveBackgroundLearning;
#if CV_MAJOR_VERSION >= 2 && CV_MINOR_VERSION >= 4 && CV_SUBMINOR_VERSION >= 3 #if CV_MAJOR_VERSION == 2 && CV_MINOR_VERSION >= 4 && CV_SUBMINOR_VERSION >= 3
cv::Mat img_gmg; cv::Mat img_gmg;
GMG* gmg; GMG* gmg;
bool enableGMG; bool enableGMG;
......
...@@ -16,7 +16,7 @@ along with BGSLibrary. If not, see <http://www.gnu.org/licenses/>. ...@@ -16,7 +16,7 @@ along with BGSLibrary. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include "GMG.h" #include "GMG.h"
#if CV_MAJOR_VERSION == 2 #if CV_MAJOR_VERSION == 2 && CV_MINOR_VERSION >= 4 && CV_SUBMINOR_VERSION >= 3
using namespace bgslibrary::algorithms; using namespace bgslibrary::algorithms;
......
...@@ -17,7 +17,7 @@ along with BGSLibrary. If not, see <http://www.gnu.org/licenses/>. ...@@ -17,7 +17,7 @@ along with BGSLibrary. If not, see <http://www.gnu.org/licenses/>.
#pragma once #pragma once
#include "opencv2/core/version.hpp" #include "opencv2/core/version.hpp"
#if CV_MAJOR_VERSION == 2 #if CV_MAJOR_VERSION == 2 && CV_MINOR_VERSION >= 4 && CV_SUBMINOR_VERSION >= 3
#include "IBGS.h" #include "IBGS.h"
......
...@@ -207,7 +207,7 @@ PYBIND11_MODULE(bgs, m) ...@@ -207,7 +207,7 @@ PYBIND11_MODULE(bgs, m)
.def("getBackgroundModel", &LOBSTER::getBackgroundModel) .def("getBackgroundModel", &LOBSTER::getBackgroundModel)
; ;
#if CV_MAJOR_VERSION == 2 #if CV_MAJOR_VERSION == 2 && CV_MINOR_VERSION >= 4 && CV_SUBMINOR_VERSION >= 3
py::class_<MixtureOfGaussianV1>(m, "MixtureOfGaussianV1") py::class_<MixtureOfGaussianV1>(m, "MixtureOfGaussianV1")
.def(py::init<>()) .def(py::init<>())
.def("apply", &MixtureOfGaussianV1::apply) .def("apply", &MixtureOfGaussianV1::apply)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment