Fixes to solve the issue related to OpenCV 4.2.0 andrewssobral#175 (a…

…ndrewssobral#176)
KhanMechAI · Feb 17, 2023 · 703d541 · 703d541
1 parent 0fbd9f5
commit 703d541
Show file tree

Hide file tree

Showing 20 changed files with 98 additions and 0 deletions.
diff --git a/src/algorithms/LBP_MRF/MEDefs.cpp b/src/algorithms/LBP_MRF/MEDefs.cpp
@@ -2,6 +2,8 @@
 
 #include "MEDefs.hpp"
 
+#if CV_MAJOR_VERSION >= 2 && CV_MAJOR_VERSION <= 3
+
 //using namespace bgslibrary::algorithms::lbp_mrf;
 
 namespace bgslibrary
@@ -27,3 +29,5 @@ namespace bgslibrary
     }
   }
 }
+
+#endif
diff --git a/src/algorithms/LBP_MRF/MEDefs.hpp b/src/algorithms/LBP_MRF/MEDefs.hpp
@@ -1,5 +1,8 @@
 #pragma once
 
+#include "opencv2/core/version.hpp"
+#if CV_MAJOR_VERSION >= 2 && CV_MAJOR_VERSION <= 3
+
 namespace bgslibrary
 {
   namespace algorithms
@@ -58,3 +61,5 @@ namespace bgslibrary
     }
   }
 }
+
+#endif
diff --git a/src/algorithms/LBP_MRF/MEHistogram.cpp b/src/algorithms/LBP_MRF/MEHistogram.cpp
@@ -8,6 +8,8 @@
 #include "MEDefs.hpp"
 #include "MEImage.hpp"
 
+#if CV_MAJOR_VERSION >= 2 && CV_MAJOR_VERSION <= 3
+
 using namespace bgslibrary::algorithms::lbp_mrf;
 
 MEHistogram::MEHistogram() {
@@ -459,3 +461,5 @@ void MEHistogramTransform::SetStretchProcessingMode(ProcessingType new_channel_m
     break;
   }
 }
+
+#endif
diff --git a/src/algorithms/LBP_MRF/MEHistogram.hpp b/src/algorithms/LBP_MRF/MEHistogram.hpp
@@ -1,5 +1,8 @@
 #pragma once
 
+#include "opencv2/core/version.hpp"
+#if CV_MAJOR_VERSION >= 2 && CV_MAJOR_VERSION <= 3
+
 namespace bgslibrary
 {
   namespace algorithms
@@ -324,3 +327,5 @@ namespace bgslibrary
     }
   }
 }
+
+#endif
diff --git a/src/algorithms/LBP_MRF/MEImage.cpp b/src/algorithms/LBP_MRF/MEImage.cpp
@@ -6,6 +6,8 @@
 #include "MEImage.hpp"
 #include "MEDefs.hpp"
 
+#if CV_MAJOR_VERSION >= 2 && CV_MAJOR_VERSION <= 3
+
 //using namespace bgslibrary::algorithms::lbp_mrf;
 
 #define ME_CAST_TO_IPLIMAGE(image_ptr) ((IplImage*)image_ptr)
@@ -1401,3 +1403,5 @@ namespace bgslibrary
     }
   }
 }
+
+#endif
diff --git a/src/algorithms/LBP_MRF/MEImage.hpp b/src/algorithms/LBP_MRF/MEImage.hpp
@@ -1,5 +1,8 @@
 #pragma once
 
+#include "opencv2/core/version.hpp"
+#if CV_MAJOR_VERSION >= 2 && CV_MAJOR_VERSION <= 3
+
 namespace bgslibrary
 {
   namespace algorithms
@@ -975,3 +978,5 @@ namespace bgslibrary
     }
   }
 }
+
+#endif
diff --git a/src/algorithms/MultiLayer/BGS.h b/src/algorithms/MultiLayer/BGS.h
@@ -1,5 +1,8 @@
 #pragma once
 
+#include "opencv2/core/version.hpp"
+#if CV_MAJOR_VERSION >= 2 && CV_MAJOR_VERSION <= 3
+
 // opencv legacy includes
 #include "OpenCvLegacyIncludes.h"
 
@@ -168,3 +171,5 @@ namespace bgslibrary
     }
   }
 }
+
+#endif
diff --git a/src/algorithms/MultiLayer/BackgroundSubtractionAPI.h b/src/algorithms/MultiLayer/BackgroundSubtractionAPI.h
@@ -1,5 +1,8 @@
 #pragma once
 
+#include "opencv2/core/version.hpp"
+#if CV_MAJOR_VERSION >= 2 && CV_MAJOR_VERSION <= 3
+
 // opencv legacy includes
 #include "OpenCvLegacyIncludes.h"
 
@@ -99,3 +102,5 @@ namespace bgslibrary
     }
   }
 }
+
+#endif
diff --git a/src/algorithms/MultiLayer/BlobExtraction.cpp b/src/algorithms/MultiLayer/BlobExtraction.cpp
@@ -1,3 +1,6 @@
+#include "opencv2/core/version.hpp"
+#if CV_MAJOR_VERSION >= 2 && CV_MAJOR_VERSION <= 3
+
 #include "BlobResult.h"
 #include "BlobExtraction.h"
 #include "OpenCvLegacyIncludes.h"
@@ -1447,3 +1450,5 @@ namespace bgslibrary
     }
   }
 }
+
+#endif
diff --git a/src/algorithms/MultiLayer/BlobExtraction.h b/src/algorithms/MultiLayer/BlobExtraction.h
@@ -1,5 +1,8 @@
 #pragma once
 
+#include "opencv2/core/version.hpp"
+#if CV_MAJOR_VERSION >= 2 && CV_MAJOR_VERSION <= 3
+
 namespace bgslibrary
 {
   namespace algorithms
@@ -24,3 +27,5 @@ namespace bgslibrary
     }
   }
 }
+
+#endif
diff --git a/src/algorithms/MultiLayer/BlobResult.cpp b/src/algorithms/MultiLayer/BlobResult.cpp
@@ -3,6 +3,9 @@
 #include <functional>
 #include <algorithm>
 
+#include "opencv2/core/version.hpp"
+#if CV_MAJOR_VERSION >= 2 && CV_MAJOR_VERSION <= 3
+
 #include "BlobResult.h"
 #include "BlobExtraction.h"
 
@@ -798,3 +801,5 @@ namespace bgslibrary
     }
   }
 }
+
+#endif
diff --git a/src/algorithms/MultiLayer/BlobResult.h b/src/algorithms/MultiLayer/BlobResult.h
@@ -4,6 +4,9 @@
 #include <vector>
 #include <functional>
 
+#include "opencv2/core/version.hpp"
+#if CV_MAJOR_VERSION >= 2 && CV_MAJOR_VERSION <= 3
+
 #include "BlobLibraryConfiguration.h"
 // opencv legacy includes
 #include "OpenCvLegacyIncludes.h"
@@ -143,3 +146,5 @@ namespace bgslibrary
     }
   }
 }
+
+#endif
diff --git a/src/algorithms/MultiLayer/CMultiLayerBGS.cpp b/src/algorithms/MultiLayer/CMultiLayerBGS.cpp
@@ -6,6 +6,9 @@
 #include <cmath>
 #include <iostream>
 
+#include "opencv2/core/version.hpp"
+#if CV_MAJOR_VERSION >= 2 && CV_MAJOR_VERSION <= 3
+
 #include "CMultiLayerBGS.h"
 #include "OpenCvLegacyIncludes.h"
 
@@ -2099,3 +2102,5 @@ int CMultiLayerBGS::SetForegroundProbImage(IplImage* fg_prob_img) {
 void CMultiLayerBGS::SetCurrentFrameNumber(unsigned long cur_frame_no) {
   m_nCurImgFrameIdx = cur_frame_no;
 }
+
+#endif
diff --git a/src/algorithms/MultiLayer/CMultiLayerBGS.h b/src/algorithms/MultiLayer/CMultiLayerBGS.h
@@ -20,6 +20,9 @@ step. If you compile it under Linux, please uncomment it.
 
 #include <opencv2/imgproc.hpp>
 
+#include "opencv2/core/version.hpp"
+#if CV_MAJOR_VERSION >= 2 && CV_MAJOR_VERSION <= 3
+
 #include "LocalBinaryPattern.h"
 #include "BlobResult.h"
 #include "OpenCvDataConversion.h"
@@ -269,3 +272,5 @@ namespace bgslibrary
     }
   }
 }
+
+#endif
diff --git a/src/algorithms/MultiLayer/LocalBinaryPattern.cpp b/src/algorithms/MultiLayer/LocalBinaryPattern.cpp
@@ -1,5 +1,8 @@
 #include "LocalBinaryPattern.h"
 
+#include "opencv2/core/version.hpp"
+#if CV_MAJOR_VERSION >= 2 && CV_MAJOR_VERSION <= 3
+
 using namespace bgslibrary::algorithms::multilayer;
 
 CLocalBinaryPattern::CLocalBinaryPattern() {
@@ -251,3 +254,4 @@ void CLocalBinaryPattern::CalImageDifferenceMap(IplImage *cent_img, IplImage *ne
 
 }
 
+#endif
diff --git a/src/algorithms/MultiLayer/LocalBinaryPattern.h b/src/algorithms/MultiLayer/LocalBinaryPattern.h
@@ -2,6 +2,9 @@
 
 #include <cstdio>
 
+#include "opencv2/core/version.hpp"
+#if CV_MAJOR_VERSION >= 2 && CV_MAJOR_VERSION <= 3
+
 #include "BGS.h"
 #include "OpenCvDataConversion.h"
 
@@ -57,3 +60,5 @@ namespace bgslibrary
     }
   }
 }
+
+#endif
diff --git a/src/algorithms/MultiLayer/OpenCvDataConversion.h b/src/algorithms/MultiLayer/OpenCvDataConversion.h
@@ -1,6 +1,10 @@
 #pragma once
 
 #include <stdio.h>
+
+#include "opencv2/core/version.hpp"
+#if CV_MAJOR_VERSION >= 2 && CV_MAJOR_VERSION <= 3
+
 // opencv legacy includes
 #include "OpenCvLegacyIncludes.h"
 
@@ -182,3 +186,5 @@ namespace bgslibrary
     }
   }
 }
+
+#endif
diff --git a/src/algorithms/MultiLayer/OpenCvLegacyIncludes.h b/src/algorithms/MultiLayer/OpenCvLegacyIncludes.h
@@ -1,5 +1,11 @@
 #pragma once
+
+#include "opencv2/core/version.hpp"
+#if CV_MAJOR_VERSION >= 2 && CV_MAJOR_VERSION <= 3
+
 // opencv legacy includes
 #include "opencv2/core/core_c.h"
 #include "opencv2/core/types_c.h"
 #include "opencv2/imgproc/imgproc_c.h"
+
+#endif
diff --git a/src/algorithms/MultiLayer/blob.cpp b/src/algorithms/MultiLayer/blob.cpp
@@ -1,6 +1,9 @@
 #include <limits.h>
 #include "blob.h"
 
+#include "opencv2/core/version.hpp"
+#if CV_MAJOR_VERSION >= 2 && CV_MAJOR_VERSION <= 3
+
 namespace bgslibrary
 {
   namespace algorithms
@@ -1092,3 +1095,5 @@ namespace bgslibrary
     }
   }
 }
+
+#endif
diff --git a/src/algorithms/MultiLayer/blob.h b/src/algorithms/MultiLayer/blob.h
@@ -4,6 +4,9 @@
 #include <vector>
 #include <algorithm>
 
+#include "opencv2/core/version.hpp"
+#if CV_MAJOR_VERSION >= 2 && CV_MAJOR_VERSION <= 3
+
 #include "BlobLibraryConfiguration.h"
 // opencv legacy includes
 #include "OpenCvLegacyIncludes.h"
@@ -790,3 +793,5 @@ namespace bgslibrary
     }
   }
 }
+
+#endif