diff --git a/src/Detector/BaseDetector.cpp b/src/Detector/BaseDetector.cpp index 382c69da..e93c839d 100644 --- a/src/Detector/BaseDetector.cpp +++ b/src/Detector/BaseDetector.cpp @@ -54,22 +54,12 @@ std::unique_ptr BaseDetector::CreateDetector(tracking::Detectors d break; case tracking::Face_HAAR: -#if (CV_VERSION_MAJOR < 5) detector = std::make_unique(frame); -#else - std::cerr << "Haar detector was removed from OpenCV 5.0" << std::endl; - CV_Assert(0); -#endif break; case tracking::Pedestrian_HOG: case tracking::Pedestrian_C4: -#if (CV_VERSION_MAJOR < 5) detector = std::make_unique(frame); -#else - std::cerr << "HOG detector was removed from OpenCV 5.0" << std::endl; - CV_Assert(0); -#endif break; #ifdef USE_OCV_DNN diff --git a/src/Detector/FaceDetector.cpp b/src/Detector/FaceDetector.cpp index 3e18440f..c59abcac 100644 --- a/src/Detector/FaceDetector.cpp +++ b/src/Detector/FaceDetector.cpp @@ -1,7 +1,5 @@ #include "FaceDetector.h" -#if (CV_VERSION_MAJOR < 5) - /// /// \brief FaceDetector::FaceDetector /// \param gray @@ -59,5 +57,3 @@ void FaceDetector::Detect(const cv::UMat& gray) m_regions.push_back(rect); } } - -#endif //(CV_VERSION_MAJOR < 5) diff --git a/src/Detector/FaceDetector.h b/src/Detector/FaceDetector.h index dd7b9b57..8f3e911f 100644 --- a/src/Detector/FaceDetector.h +++ b/src/Detector/FaceDetector.h @@ -2,7 +2,10 @@ #include "BaseDetector.h" -#if (CV_VERSION_MAJOR < 5) +#if (CV_VERSION_MAJOR >= 5) +#include +#endif //(CV_VERSION_MAJOR < 5) + /// /// \brief The FaceDetector class /// @@ -25,4 +28,3 @@ class FaceDetector final : public BaseDetector private: cv::CascadeClassifier m_cascade; }; -#endif //(CV_VERSION_MAJOR < 5) diff --git a/src/Detector/PedestrianDetector.cpp b/src/Detector/PedestrianDetector.cpp index 94cc298e..0832d7ec 100644 --- a/src/Detector/PedestrianDetector.cpp +++ b/src/Detector/PedestrianDetector.cpp @@ -1,8 +1,6 @@ #include "PedestrianDetector.h" #include "nms.h" -#if (CV_VERSION_MAJOR < 5) - /// /// \brief PedestrianDetector::PedestrianDetector /// \param gray @@ -105,4 +103,3 @@ void PedestrianDetector::Detect(const cv::UMat& gray) m_regions.push_back(rect); } } -#endif //(CV_VERSION_MAJOR < 5) diff --git a/src/Detector/PedestrianDetector.h b/src/Detector/PedestrianDetector.h index d76adf4f..efb123e2 100644 --- a/src/Detector/PedestrianDetector.h +++ b/src/Detector/PedestrianDetector.h @@ -2,7 +2,9 @@ #include "BaseDetector.h" -#if (CV_VERSION_MAJOR < 5) +#if (CV_VERSION_MAJOR >= 5) +#include +#endif //(CV_VERSION_MAJOR < 5) #include "pedestrians/c4-pedestrian-detector.h" @@ -50,5 +52,3 @@ class PedestrianDetector final : public BaseDetector static const int HUMAN_xdiv = 9; static const int HUMAN_ydiv = 4; }; - -#endif //(CV_VERSION_MAJOR < 5)