diff --git a/bgslibrary/algorithms/LBMixtureOfGaussians.cpp b/bgslibrary/algorithms/LBMixtureOfGaussians.cpp index eaa270979d8459562ce8982491de493036fd7f8c..e57609d456352b09b8703ad18255c8b984e8e021 100644 --- a/bgslibrary/algorithms/LBMixtureOfGaussians.cpp +++ b/bgslibrary/algorithms/LBMixtureOfGaussians.cpp @@ -1,7 +1,5 @@ #include "LBMixtureOfGaussians.h" -#if CV_MAJOR_VERSION >= 2 && CV_MAJOR_VERSION <= 3 - using namespace bgslibrary::algorithms; LBMixtureOfGaussians::LBMixtureOfGaussians() : @@ -72,5 +70,3 @@ void LBMixtureOfGaussians::load_config(cv::FileStorage &fs) { fs["noiseVariance"] >> noiseVariance; fs["showOutput"] >> showOutput; } - -#endif diff --git a/bgslibrary/algorithms/LBMixtureOfGaussians.h b/bgslibrary/algorithms/LBMixtureOfGaussians.h index 4454adfc7ef6fc3500c7f4a79134b0edc0ef48b8..aa4e327fdd4282e8c06b0893b7499e045e2a67d9 100644 --- a/bgslibrary/algorithms/LBMixtureOfGaussians.h +++ b/bgslibrary/algorithms/LBMixtureOfGaussians.h @@ -1,10 +1,6 @@ #pragma once #include "IBGS.h" - -#include "opencv2/core/version.hpp" -#if CV_MAJOR_VERSION == 2 || CV_MAJOR_VERSION == 3 - #include "lb/BGModelMog.h" namespace bgslibrary @@ -34,5 +30,3 @@ namespace bgslibrary bgs_register(LBMixtureOfGaussians); } } - -#endif diff --git a/bgslibrary/algorithms/algorithms.h b/bgslibrary/algorithms/algorithms.h index b6d92b9aee67c528c717c2819399fb494a99a577..ff566c894719eae6d101cae64324d4f6f100f8e4 100644 --- a/bgslibrary/algorithms/algorithms.h +++ b/bgslibrary/algorithms/algorithms.h @@ -26,7 +26,7 @@ #include "FuzzyChoquetIntegral.h" #include "LBSimpleGaussian.h" #include "LBFuzzyGaussian.h" -#include "LBMixtureOfGaussians.h" // Only for OpenCV 2 or 3 +#include "LBMixtureOfGaussians.h" #include "LBAdaptiveSOM.h" #include "LBFuzzyAdaptiveSOM.h" #include "LBP_MRF.h" // Only for OpenCV 2 or OpenCV <= 3.4.7