mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-07-26 07:07:37 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

apps: apply CV_OVERRIDE/CV_FINAL

Browse Source
This commit is contained in:
Alexander Alekhin 2018-03-20 15:53:57 +03:00
parent 6c8014e7d1
commit 39f15be59e
2 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
apps/interactive-calibration/frameProcessor.hpp
View File

@ -61,10 +61,10 @@ protected:
public: public:
CalibProcessor(cv::Ptr<calibrationData> data, captureParameters& capParams); CalibProcessor(cv::Ptr<calibrationData> data, captureParameters& capParams);
virtual cv::Mat processFrame(const cv::Mat& frame); virtual cv::Mat processFrame(const cv::Mat& frame) CV_OVERRIDE;
virtual bool isProcessed() const; virtual bool isProcessed() const CV_OVERRIDE;
virtual void resetState(); virtual void resetState() CV_OVERRIDE;
~CalibProcessor(); ~CalibProcessor() CV_OVERRIDE;
}; };
enum visualisationMode {Grid, Window}; enum visualisationMode {Grid, Window};
@ -84,9 +84,9 @@ protected:
void drawGridPoints(const cv::Mat& frame); void drawGridPoints(const cv::Mat& frame);
public: public:
ShowProcessor(cv::Ptr<calibrationData> data, cv::Ptr<calibController> controller, TemplateType board); ShowProcessor(cv::Ptr<calibrationData> data, cv::Ptr<calibController> controller, TemplateType board);
virtual cv::Mat processFrame(const cv::Mat& frame); virtual cv::Mat processFrame(const cv::Mat& frame) CV_OVERRIDE;
virtual bool isProcessed() const; virtual bool isProcessed() const CV_OVERRIDE;
virtual void resetState(); virtual void resetState() CV_OVERRIDE;
void setVisualizationMode(visualisationMode mode); void setVisualizationMode(visualisationMode mode);
void switchVisualizationMode(); void switchVisualizationMode();
@ -95,7 +95,7 @@ public:
void switchUndistort(); void switchUndistort();
void setUndistort(bool isEnabled); void setUndistort(bool isEnabled);
~ShowProcessor(); ~ShowProcessor() CV_OVERRIDE;
}; };
} }

4
apps/traincascade/CMakeLists.txt
View File

@ -8,7 +8,9 @@ endif()
project(traincascade) project(traincascade)
set(the_target opencv_traincascade) set(the_target opencv_traincascade)
ocv_warnings_disable(CMAKE_CXX_FLAGS -Woverloaded-virtual) ocv_warnings_disable(CMAKE_CXX_FLAGS -Woverloaded-virtual
-Winconsistent-missing-override -Wsuggest-override
)
ocv_target_include_directories(${the_target} PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}" "${OpenCV_SOURCE_DIR}/include/opencv") ocv_target_include_directories(${the_target} PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}" "${OpenCV_SOURCE_DIR}/include/opencv")
ocv_target_include_modules_recurse(${the_target} ${OPENCV_TRAINCASCADE_DEPS}) ocv_target_include_modules_recurse(${the_target} ${OPENCV_TRAINCASCADE_DEPS})