Enabled LBMixtureOfGaussians for OpenCV 4.x

andrewssobral · Mar 4, 2023 · 55f5c75 · 55f5c75
1 parent dffa9fe
commit 55f5c75
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 11 deletions.
diff --git 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
@@ -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
@@ -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