datasets: apply CV_OVERRIDE/CV_FINAL

modules/datasets/CMakeLists.txt

@@ -1,4 +1,12 @@
 set(the_description "datasets framework")
+
+set(filter_srcs "${CMAKE_CURRENT_LIST_DIR}/src/tinyxml2/tinyxml2.cpp")
+if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
+  ocv_append_source_files_cxx_compiler_options(filter_srcs "-Wno-suggest-override")  # GCC
+elseif(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
+  ocv_append_source_files_cxx_compiler_options(filter_srcs "-Wno-inconsistent-missing-override")  # Clang
+endif()
+
 ocv_define_module(datasets opencv_core opencv_imgcodecs opencv_ml opencv_flann OPTIONAL opencv_text WRAP python)
 
 ocv_warnings_disable(CMAKE_CXX_FLAGS /wd4267) # flann, Win64

modules/datasets/include/opencv2/datasets/ar_hmdb.hpp

@@ -67,7 +67,7 @@ struct AR_hmdbObj : public Object
 class CV_EXPORTS AR_hmdb : public Dataset
 {
 public:
-    virtual void load(const std::string &path) = 0;
+    virtual void load(const std::string &path) CV_OVERRIDE = 0;
 
     static Ptr<AR_hmdb> create();
 };

modules/datasets/include/opencv2/datasets/ar_sports.hpp

@@ -66,7 +66,7 @@ struct AR_sportsObj : public Object
 class CV_EXPORTS AR_sports : public Dataset
 {
 public:
-    virtual void load(const std::string &path) = 0;
+    virtual void load(const std::string &path) CV_OVERRIDE = 0;
 
     static Ptr<AR_sports> create();
 };

modules/datasets/include/opencv2/datasets/fr_adience.hpp

@@ -83,7 +83,7 @@ struct FR_adienceObj : public Object
 class CV_EXPORTS FR_adience : public Dataset
 {
 public:
-    virtual void load(const std::string &path) = 0;
+    virtual void load(const std::string &path) CV_OVERRIDE = 0;
 
     static Ptr<FR_adience> create();
 

modules/datasets/include/opencv2/datasets/fr_lfw.hpp

@@ -66,7 +66,7 @@ struct FR_lfwObj : public Object
 class CV_EXPORTS FR_lfw : public Dataset
 {
 public:
-    virtual void load(const std::string &path) = 0;
+    virtual void load(const std::string &path) CV_OVERRIDE = 0;
 
     static Ptr<FR_lfw> create();
 };

modules/datasets/include/opencv2/datasets/gr_chalearn.hpp

@@ -83,7 +83,7 @@ struct GR_chalearnObj : public Object
 class CV_EXPORTS GR_chalearn : public Dataset
 {
 public:
-    virtual void load(const std::string &path) = 0;
+    virtual void load(const std::string &path) CV_OVERRIDE = 0;
 
     static Ptr<GR_chalearn> create();
 };

modules/datasets/include/opencv2/datasets/gr_skig.hpp

@@ -105,7 +105,7 @@ struct GR_skigObj : public Object
 class CV_EXPORTS GR_skig : public Dataset
 {
 public:
-    virtual void load(const std::string &path) = 0;
+    virtual void load(const std::string &path) CV_OVERRIDE = 0;
 
     static Ptr<GR_skig> create();
 };

modules/datasets/include/opencv2/datasets/hpe_humaneva.hpp

@@ -77,7 +77,7 @@ enum datasetType
 class CV_EXPORTS HPE_humaneva : public Dataset
 {
 public:
-    virtual void load(const std::string &path) = 0;
+    virtual void load(const std::string &path) CV_OVERRIDE = 0;
 
     static Ptr<HPE_humaneva> create(int num=humaneva_1);
 };

modules/datasets/include/opencv2/datasets/hpe_parse.hpp

@@ -65,7 +65,7 @@ struct HPE_parseObj : public Object
 class CV_EXPORTS HPE_parse : public Dataset
 {
 public:
-    virtual void load(const std::string &path) = 0;
+    virtual void load(const std::string &path) CV_OVERRIDE = 0;
 
     static Ptr<HPE_parse> create();
 };

modules/datasets/include/opencv2/datasets/ir_affine.hpp

@@ -67,7 +67,7 @@ struct IR_affineObj : public Object
 class CV_EXPORTS IR_affine : public Dataset
 {
 public:
-    virtual void load(const std::string &path) = 0;
+    virtual void load(const std::string &path) CV_OVERRIDE = 0;
 
     static Ptr<IR_affine> create();
 };

modules/datasets/include/opencv2/datasets/ir_robot.hpp

@@ -76,7 +76,7 @@ struct IR_robotObj : public Object
 class CV_EXPORTS IR_robot : public Dataset
 {
 public:
-    virtual void load(const std::string &path) = 0;
+    virtual void load(const std::string &path) CV_OVERRIDE = 0;
 
     static Ptr<IR_robot> create();
 };

modules/datasets/include/opencv2/datasets/is_bsds.hpp

@@ -65,7 +65,7 @@ struct IS_bsdsObj : public Object
 class CV_EXPORTS IS_bsds : public Dataset
 {
 public:
-    virtual void load(const std::string &path) = 0;
+    virtual void load(const std::string &path) CV_OVERRIDE = 0;
 
     static Ptr<IS_bsds> create();
 };

modules/datasets/include/opencv2/datasets/is_weizmann.hpp

@@ -68,7 +68,7 @@ struct IS_weizmannObj : public Object
 class CV_EXPORTS IS_weizmann : public Dataset
 {
 public:
-    virtual void load(const std::string &path) = 0;
+    virtual void load(const std::string &path) CV_OVERRIDE = 0;
 
     static Ptr<IS_weizmann> create();
 };

modules/datasets/include/opencv2/datasets/msm_epfl.hpp

@@ -77,7 +77,7 @@ struct MSM_epflObj : public Object
 class CV_EXPORTS MSM_epfl : public Dataset
 {
 public:
-    virtual void load(const std::string &path) = 0;
+    virtual void load(const std::string &path) CV_OVERRIDE = 0;
 
     static Ptr<MSM_epfl> create();
 };

modules/datasets/include/opencv2/datasets/msm_middlebury.hpp

@@ -68,7 +68,7 @@ struct MSM_middleburyObj : public Object
 class CV_EXPORTS MSM_middlebury : public Dataset
 {
 public:
-    virtual void load(const std::string &path) = 0;
+    virtual void load(const std::string &path) CV_OVERRIDE = 0;
 
     static Ptr<MSM_middlebury> create();
 };

modules/datasets/include/opencv2/datasets/or_imagenet.hpp

@@ -66,7 +66,7 @@ struct OR_imagenetObj : public Object
 class CV_EXPORTS OR_imagenet : public Dataset
 {
 public:
-    virtual void load(const std::string &path) = 0;
+    virtual void load(const std::string &path) CV_OVERRIDE = 0;
 
     static Ptr<OR_imagenet> create();
 };

modules/datasets/include/opencv2/datasets/or_mnist.hpp

@@ -66,7 +66,7 @@ struct OR_mnistObj : public Object
 class CV_EXPORTS OR_mnist : public Dataset
 {
 public:
-    virtual void load(const std::string &path) = 0;
+    virtual void load(const std::string &path) CV_OVERRIDE = 0;
 
     static Ptr<OR_mnist> create();
 };

modules/datasets/include/opencv2/datasets/or_pascal.hpp

@@ -89,7 +89,7 @@ struct OR_pascalObj : public Object
 class CV_EXPORTS OR_pascal : public Dataset
 {
 public:
-    virtual void load(const std::string &path) = 0;
+    virtual void load(const std::string &path) CV_OVERRIDE = 0;
 
     static Ptr<OR_pascal> create();
 };

modules/datasets/include/opencv2/datasets/or_sun.hpp

@@ -66,7 +66,7 @@ struct OR_sunObj : public Object
 class CV_EXPORTS OR_sun : public Dataset
 {
 public:
-    virtual void load(const std::string &path) = 0;
+    virtual void load(const std::string &path) CV_OVERRIDE = 0;
 
     static Ptr<OR_sun> create();
 

modules/datasets/include/opencv2/datasets/pd_caltech.hpp

@@ -76,7 +76,7 @@ struct PD_caltechObj : public Object
 class CV_EXPORTS PD_caltech : public Dataset
 {
 public:
-    virtual void load(const std::string &path) = 0;
+    virtual void load(const std::string &path) CV_OVERRIDE = 0;
 
     static Ptr<PD_caltech> create();
 };

modules/datasets/include/opencv2/datasets/pd_inria.hpp

@@ -57,7 +57,7 @@ namespace datasets
 //! @addtogroup datasets_pd
 //! @{
 
-enum sampleType 
+enum sampleType
 {
     POS = 0,
     NEG = 1
@@ -67,7 +67,7 @@ struct PD_inriaObj : public Object
 {
     // image file name
     std::string filename;
-    
+
     // positive or negative
     sampleType sType;
 
@@ -83,7 +83,7 @@ struct PD_inriaObj : public Object
 class CV_EXPORTS PD_inria : public Dataset
 {
 public:
-    virtual void load(const std::string &path) = 0;
+    virtual void load(const std::string &path) CV_OVERRIDE = 0;
 
     static Ptr<PD_inria> create();
 };

modules/datasets/include/opencv2/datasets/slam_kitti.hpp

@@ -74,7 +74,7 @@ struct SLAM_kittiObj : public Object
 class CV_EXPORTS SLAM_kitti : public Dataset
 {
 public:
-    virtual void load(const std::string &path) = 0;
+    virtual void load(const std::string &path) CV_OVERRIDE = 0;
 
     static Ptr<SLAM_kitti> create();
 };

modules/datasets/include/opencv2/datasets/slam_tumindoor.hpp

@@ -74,7 +74,7 @@ struct SLAM_tumindoorObj : public Object
 class CV_EXPORTS SLAM_tumindoor : public Dataset
 {
 public:
-    virtual void load(const std::string &path) = 0;
+    virtual void load(const std::string &path) CV_OVERRIDE = 0;
 
     static Ptr<SLAM_tumindoor> create();
 };

modules/datasets/include/opencv2/datasets/tr_chars.hpp

@@ -66,7 +66,7 @@ struct TR_charsObj : public Object
 class CV_EXPORTS TR_chars : public Dataset
 {
 public:
-    virtual void load(const std::string &path) = 0;
+    virtual void load(const std::string &path) CV_OVERRIDE = 0;
 
     static Ptr<TR_chars> create();
 };

modules/datasets/include/opencv2/datasets/tr_icdar.hpp

@@ -74,7 +74,7 @@ struct TR_icdarObj : public Object
 class CV_EXPORTS TR_icdar : public Dataset
 {
 public:
-    virtual void load(const std::string &path) = 0;
+    virtual void load(const std::string &path) CV_OVERRIDE = 0;
 
     static Ptr<TR_icdar> create();
 };

modules/datasets/include/opencv2/datasets/tr_svt.hpp

@@ -73,7 +73,7 @@ struct TR_svtObj : public Object
 class CV_EXPORTS TR_svt : public Dataset
 {
 public:
-    virtual void load(const std::string &path) = 0;
+    virtual void load(const std::string &path) CV_OVERRIDE = 0;
 
     static Ptr<TR_svt> create();
 };

modules/datasets/include/opencv2/datasets/track_alov.hpp

@@ -75,7 +75,7 @@ class CV_EXPORTS TRACK_alov : public Dataset
 public:
     static Ptr<TRACK_alov> create();
 
-    virtual void load(const std::string &path) = 0;
+    virtual void load(const std::string &path) CV_OVERRIDE = 0;
 
     //Load only frames with annotations (~every 5-th frame)
     virtual void loadAnnotatedOnly(const std::string &path) = 0;

modules/datasets/include/opencv2/datasets/track_vot.hpp

@@ -70,7 +70,7 @@ class CV_EXPORTS TRACK_vot : public Dataset
 public:
     static Ptr<TRACK_vot> create();
 
-    virtual void load(const std::string &path) = 0;
+    virtual void load(const std::string &path) CV_OVERRIDE = 0;
 
     virtual int getDatasetsNum() = 0;
 

modules/datasets/src/ar_hmdb.cpp

@@ -58,7 +58,7 @@ public:
     //AR_hmdbImp(const string &path, int number = 0);
     virtual ~AR_hmdbImp() {}
 
-    virtual void load(const string &path);
+    virtual void load(const string &path) CV_OVERRIDE;
 
 private:
     void loadDatasetSplit(const string &path, int number = 0);

modules/datasets/src/ar_sports.cpp

@@ -56,7 +56,7 @@ public:
     //AR_sportsImp(const string &path);
     virtual ~AR_sportsImp() {}
 
-    virtual void load(const string &path);
+    virtual void load(const string &path) CV_OVERRIDE;
 
 private:
     void loadDataset(const string &path);

modules/datasets/src/fr_adience.cpp

@@ -52,14 +52,14 @@ namespace datasets
 
 using namespace std;
 
-class FR_adienceImp : public FR_adience
+class FR_adienceImp CV_FINAL : public FR_adience
 {
 public:
     FR_adienceImp() {}
     //FR_adienceImp(const string &path);
     virtual ~FR_adienceImp() {}
 
-    virtual void load(const string &path);
+    virtual void load(const string &path) CV_OVERRIDE;
 
 private:
     void loadDataset(const string &path);

modules/datasets/src/fr_lfw.cpp

@@ -51,14 +51,14 @@ namespace datasets
 
 using namespace std;
 
-class FR_lfwImp : public FR_lfw
+class FR_lfwImp CV_FINAL : public FR_lfw
 {
 public:
     FR_lfwImp() {}
     //FR_lfwImp(const string &path);
     virtual ~FR_lfwImp() {}
 
-    virtual void load(const string &path);
+    virtual void load(const string &path) CV_OVERRIDE;
 
 private:
     void loadDataset(const string &path);

modules/datasets/src/gr_chalearn.cpp

@@ -49,14 +49,14 @@ namespace datasets
 
 using namespace std;
 
-class GR_chalearnImp : public GR_chalearn
+class GR_chalearnImp CV_FINAL : public GR_chalearn
 {
 public:
     GR_chalearnImp() {}
     //GR_chalearnImp(const string &path);
     virtual ~GR_chalearnImp() {}
 
-    virtual void load(const string &path);
+    virtual void load(const string &path) CV_OVERRIDE;
 
 private:
     void loadDataset(const string &path);

modules/datasets/src/gr_skig.cpp

@@ -51,14 +51,14 @@ namespace datasets
 
 using namespace std;
 
-class GR_skigImp : public GR_skig
+class GR_skigImp CV_FINAL : public GR_skig
 {
 public:
     GR_skigImp() {}
     //GR_skigImp(const string &path);
     virtual ~GR_skigImp() {}
 
-    virtual void load(const string &path);
+    virtual void load(const string &path) CV_OVERRIDE;
 
 private:
     void loadDataset(const string &path);

modules/datasets/src/hpe_humaneva.cpp

@@ -51,14 +51,14 @@ namespace datasets
 
 using namespace std;
 
-class HPE_humanevaImp : public HPE_humaneva
+class HPE_humanevaImp CV_FINAL : public HPE_humaneva
 {
 public:
     HPE_humanevaImp() {}
     //HPE_humanevaImp(const string &path);
     virtual ~HPE_humanevaImp() {}
 
-    virtual void load(const string &path);
+    virtual void load(const string &path) CV_OVERRIDE;
 
 private:
     void loadDataset(const string &path);
@@ -138,7 +138,7 @@ public:
     //HPE_humanevaImpII(const string &path);
     virtual ~HPE_humanevaImpII() {}
 
-    virtual void load(const string &path);
+    virtual void load(const string &path) CV_OVERRIDE;
 
 private:
     void loadDataset(const string &path);

modules/datasets/src/hpe_parse.cpp

@@ -49,14 +49,14 @@ namespace datasets
 
 using namespace std;
 
-class HPE_parseImp : public HPE_parse
+class HPE_parseImp CV_FINAL : public HPE_parse
 {
 public:
     HPE_parseImp() {}
     //HPE_parseImp(const string &path);
     virtual ~HPE_parseImp() {}
 
-    virtual void load(const string &path);
+    virtual void load(const string &path) CV_OVERRIDE;
 
 private:
     void loadDataset(const string &path);

modules/datasets/src/ir_affine.cpp

@@ -49,14 +49,14 @@ namespace datasets
 
 using namespace std;
 
-class IR_affineImp : public IR_affine
+class IR_affineImp CV_FINAL : public IR_affine
 {
 public:
     IR_affineImp() {}
     //IR_affineImp(const string &path);
-    virtual ~IR_affineImp() {}
+    virtual ~IR_affineImp() CV_OVERRIDE {}
 
-    virtual void load(const string &path);
+    virtual void load(const string &path) CV_OVERRIDE;
 
 private:
     void loadDataset(const string &path);

modules/datasets/src/ir_robot.cpp

@@ -49,14 +49,14 @@ namespace datasets
 
 using namespace std;
 
-class IR_robotImp : public IR_robot
+class IR_robotImp CV_FINAL : public IR_robot
 {
 public:
     IR_robotImp() {}
     //IR_robotImp(const string &path);
     virtual ~IR_robotImp() {}
 
-    virtual void load(const string &path);
+    virtual void load(const string &path) CV_OVERRIDE;
 
 private:
     void loadDataset(const string &path);

modules/datasets/src/is_bsds.cpp

@@ -49,14 +49,14 @@ namespace datasets
 
 using namespace std;
 
-class IS_bsdsImp : public IS_bsds
+class IS_bsdsImp CV_FINAL : public IS_bsds
 {
 public:
     IS_bsdsImp() {}
     //IS_bsdsImp(const string &path);
     virtual ~IS_bsdsImp() {}
 
-    virtual void load(const string &path);
+    virtual void load(const string &path) CV_OVERRIDE;
 
 private:
     void loadDataset(const string &path);

modules/datasets/src/is_weizmann.cpp

@@ -49,14 +49,14 @@ namespace datasets
 
 using namespace std;
 
-class IS_weizmannImp : public IS_weizmann
+class IS_weizmannImp CV_FINAL : public IS_weizmann
 {
 public:
     IS_weizmannImp() {}
     //IS_weizmannImp(const string &path);
     virtual ~IS_weizmannImp() {}
 
-    virtual void load(const string &path);
+    virtual void load(const string &path) CV_OVERRIDE;
 
 private:
     void loadDataset(const string &path);

modules/datasets/src/msm_epfl.cpp

@@ -49,14 +49,14 @@ namespace datasets
 
 using namespace std;
 
-class MSM_epflImp : public MSM_epfl
+class MSM_epflImp CV_FINAL : public MSM_epfl
 {
 public:
     MSM_epflImp() {}
     //MSM_epflImp(const string &path);
-    virtual ~MSM_epflImp() {}
+    virtual ~MSM_epflImp() CV_OVERRIDE {}
 
-    virtual void load(const string &path);
+    virtual void load(const string &path) CV_OVERRIDE;
 
 private:
     void loadDataset(const string &path);

modules/datasets/src/msm_middlebury.cpp

@@ -49,14 +49,14 @@ namespace datasets
 
 using namespace std;
 
-class MSM_middleburyImp : public MSM_middlebury
+class MSM_middleburyImp CV_FINAL : public MSM_middlebury
 {
 public:
     MSM_middleburyImp() {}
     //MSM_middleburyImp(const string &path);
     virtual ~MSM_middleburyImp() {}
 
-    virtual void load(const string &path);
+    virtual void load(const string &path) CV_OVERRIDE;
 
 private:
     void loadDataset(const string &path);

modules/datasets/src/or_imagenet.cpp

@@ -51,14 +51,14 @@ namespace datasets
 
 using namespace std;
 
-class OR_imagenetImp : public OR_imagenet
+class OR_imagenetImp CV_FINAL : public OR_imagenet
 {
 public:
     OR_imagenetImp() {}
     //OR_imagenetImp(const string &path);
-    virtual ~OR_imagenetImp() {}
+    virtual ~OR_imagenetImp() CV_OVERRIDE {}
 
-    virtual void load(const string &path);
+    virtual void load(const string &path) CV_OVERRIDE;
 
 private:
     void loadDataset(const string &path);

modules/datasets/src/or_mnist.cpp

@@ -49,14 +49,14 @@ namespace datasets
 
 using namespace std;
 
-class OR_mnistImp : public OR_mnist
+class OR_mnistImp CV_FINAL : public OR_mnist
 {
 public:
     OR_mnistImp() {}
     //OR_mnistImp(const string &path);
     virtual ~OR_mnistImp() {}
 
-    virtual void load(const string &path);
+    virtual void load(const string &path) CV_OVERRIDE;
 
 private:
     void loadDataset(const string &path);

modules/datasets/src/or_pascal.cpp

@@ -41,7 +41,14 @@
 
 #include "opencv2/datasets/or_pascal.hpp"
 #include "opencv2/datasets/util.hpp"
+#if defined(__GNUC__) && __GNUC__ >= 5
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wsuggest-override"
+#endif
 #include "tinyxml2/tinyxml2.h"
+#if defined(__GNUC__) && __GNUC__ >= 5
+#pragma GCC diagnostic pop
+#endif
 #include <fstream>
 
 namespace cv
@@ -52,12 +59,12 @@ namespace datasets
 using namespace std;
 using namespace tinyxml2;
 
-class OR_pascalImp : public OR_pascal
+class OR_pascalImp CV_FINAL : public OR_pascal
 {
 public:
     OR_pascalImp() {}
 
-    virtual void load(const string &path);
+    virtual void load(const string &path) CV_OVERRIDE;
 
 private:
     void loadDataset(const string &path, const string &nameImageSet, vector< Ptr<Object> > &imageSet);

modules/datasets/src/or_sun.cpp

@@ -51,14 +51,14 @@ namespace datasets
 
 using namespace std;
 
-class OR_sunImp : public OR_sun
+class OR_sunImp CV_FINAL : public OR_sun
 {
 public:
     OR_sunImp() {}
     //OR_sunImp(const string &path);
-    virtual ~OR_sunImp() {}
+    virtual ~OR_sunImp() CV_OVERRIDE {}
 
-    virtual void load(const string &path);
+    virtual void load(const string &path) CV_OVERRIDE;
 
 private:
     void loadDataset(const string &path);

modules/datasets/src/pd_caltech.cpp

@@ -49,14 +49,14 @@ namespace datasets
 
 using namespace std;
 
-class PD_caltechImp : public PD_caltech
+class PD_caltechImp CV_FINAL : public PD_caltech
 {
 public:
     PD_caltechImp() {}
     //PD_caltechImp(const string &path);
-    virtual ~PD_caltechImp() {}
+    virtual ~PD_caltechImp() CV_OVERRIDE {}
 
-    virtual void load(const string &path);
+    virtual void load(const string &path) CV_OVERRIDE;
 
 private:
     void loadDataset(const string &path);

modules/datasets/src/pd_inria.cpp

@@ -49,14 +49,14 @@ namespace datasets
 
 using namespace std;
 
-class PD_inriaImp : public PD_inria
+class PD_inriaImp CV_FINAL : public PD_inria
 {
 public:
     PD_inriaImp() {}
-    
-    virtual ~PD_inriaImp() {}
 
-    virtual void load(const string &path);
+    virtual ~PD_inriaImp() CV_OVERRIDE {}
+
+    virtual void load(const string &path) CV_OVERRIDE;
 
 private:
     void loadDataset(const string &path, const string nameImageSet, vector< Ptr<Object> > &imageSet);
@@ -69,7 +69,7 @@ void PD_inriaImp::load(const string &path)
     // Training set
     train.push_back(vector< Ptr<Object> >());
     loadDataset(path, "Train", train.back());
-    
+
     // Testing set
     test.push_back(vector< Ptr<Object> >());
     loadDataset(path, "Test", test.back());
@@ -106,16 +106,16 @@ void PD_inriaImp::parseAnnotation(const string filename, Ptr< PD_inriaObj > &obj
         error_message = format("Unable to open file: \n%s\n", filename.c_str());
         CV_Error(Error::StsBadArg, error_message);
     }
-    
+
     string imageSizeHeader = "Image size (X x Y x C) : ";
     string imageSizeFmt = imageSizeHeader + "%d x %d x %d";
     string objWithGTHeader = "Objects with ground truth : ";
     string objWithGTFmt = objWithGTHeader + "%d { \"PASperson\" }";
     string boundBoxHeader = "Bounding box for object ";
     string boundBoxFmt = boundBoxHeader + "%*d \"PASperson\" (Xmin, Ymin) - (Xmax, Ymax) : (%d, %d) - (%d, %d)";
-    
+
     string line = "";
-    
+
     int width = 0;
     int height = 0;
     int depth = 0;
@@ -138,7 +138,7 @@ void PD_inriaImp::parseAnnotation(const string filename, Ptr< PD_inriaObj > &obj
         else if (strstr(line.c_str(), objWithGTHeader.c_str()))
         {
             sscanf(line.c_str(), objWithGTFmt.c_str(), &numObjects);
-            
+
             if (numObjects <= 0)
                 break;
         }
@@ -162,16 +162,16 @@ void PD_inriaImp::loadDataset(const string &path, const string nameImageSet, vec
     string listAnn = path + nameImageSet + "/annotations.lst";
     string listPos = path + nameImageSet + "/pos.lst";
     string listNeg = path + nameImageSet + "/neg.lst";
-    
+
     vector< string > fsAnn;
     vector< string > fsPos;
     vector< string > fsNeg;
-   
+
     // read file names
     readTextLines(listAnn, fsAnn);
     readTextLines(listPos, fsPos);
     readTextLines(listNeg, fsNeg);
-   
+
     CV_Assert(fsAnn.size() == fsPos.size());
 
     for (unsigned int i = 0; i < fsPos.size(); i++)
@@ -180,16 +180,16 @@ void PD_inriaImp::loadDataset(const string &path, const string nameImageSet, vec
         parseAnnotation(path + fsAnn[i], curr);
         curr->filename = path + fsPos[i];
         curr->sType = POS;
-        
+
         imageSet.push_back(curr);
     }
-    
+
     for (unsigned int i = 0; i < fsNeg.size(); i++)
     {
         Ptr<PD_inriaObj> curr(new PD_inriaObj);
-        curr->filename = path + fsNeg[i]; 
+        curr->filename = path + fsNeg[i];
         curr->sType = NEG;
-        
+
         imageSet.push_back(curr);
     }
 }

modules/datasets/src/slam_kitti.cpp

@@ -49,14 +49,14 @@ namespace datasets
 
 using namespace std;
 
-class SLAM_kittiImp : public SLAM_kitti
+class SLAM_kittiImp CV_FINAL : public SLAM_kitti
 {
 public:
     SLAM_kittiImp() {}
     //SLAM_kittiImp(const string &path);
-    virtual ~SLAM_kittiImp() {}
+    virtual ~SLAM_kittiImp() CV_OVERRIDE {}
 
-    virtual void load(const string &path);
+    virtual void load(const string &path) CV_OVERRIDE;
 
 private:
     void loadDataset(const string &path);

modules/datasets/src/slam_tumindoor.cpp

@@ -51,14 +51,14 @@ namespace datasets
 
 using namespace std;
 
-class SLAM_tumindoorImp : public SLAM_tumindoor
+class SLAM_tumindoorImp CV_FINAL : public SLAM_tumindoor
 {
 public:
     SLAM_tumindoorImp() {}
     //SLAM_tumindoorImp(const string &path);
-    virtual ~SLAM_tumindoorImp() {}
+    virtual ~SLAM_tumindoorImp() CV_OVERRIDE {}
 
-    virtual void load(const string &path);
+    virtual void load(const string &path) CV_OVERRIDE;
 
 private:
     void loadDataset(const string &path);

modules/datasets/src/tr_chars.cpp

@@ -49,14 +49,14 @@ namespace datasets
 
 using namespace std;
 
-class TR_charsImp : public TR_chars
+class TR_charsImp CV_FINAL : public TR_chars
 {
 public:
     TR_charsImp() {}
     //TR_charsImp(const string &path, int number = 0);
-    virtual ~TR_charsImp() {}
+    virtual ~TR_charsImp() CV_OVERRIDE {}
 
-    virtual void load(const string &path);
+    virtual void load(const string &path) CV_OVERRIDE;
 
 private:
     void loadDatasetSplit(const string &path, int number);

modules/datasets/src/tr_icdar.cpp

@@ -53,14 +53,14 @@ namespace datasets
 
 using namespace std;
 
-class TR_icdarImp : public TR_icdar
+class TR_icdarImp CV_FINAL : public TR_icdar
 {
 public:
     TR_icdarImp() {}
     //TR_icdarImp(const string &path);
-    virtual ~TR_icdarImp() {}
+    virtual ~TR_icdarImp() CV_OVERRIDE {}
 
-    virtual void load(const string &path);
+    virtual void load(const string &path) CV_OVERRIDE;
 
 private:
     void loadDataset(const string &path);

modules/datasets/src/tr_svt.cpp

@@ -42,7 +42,14 @@
 #include "opencv2/datasets/tr_svt.hpp"
 #include "opencv2/datasets/util.hpp"
 
+#if defined(__GNUC__) && __GNUC__ >= 5
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wsuggest-override"
+#endif
 #include "tinyxml2/tinyxml2.h"
+#if defined(__GNUC__) && __GNUC__ >= 5
+#pragma GCC diagnostic pop
+#endif
 
 namespace cv
 {
@@ -52,14 +59,14 @@ namespace datasets
 using namespace std;
 using namespace tinyxml2;
 
-class TR_svtImp : public TR_svt
+class TR_svtImp CV_FINAL : public TR_svt
 {
 public:
     TR_svtImp() {}
     //TR_svtImp(const string &path);
-    virtual ~TR_svtImp() {}
+    virtual ~TR_svtImp() CV_OVERRIDE {}
 
-    virtual void load(const string &path);
+    virtual void load(const string &path) CV_OVERRIDE;
 
 private:
     void loadDataset(const string &path);

modules/datasets/src/track_alov.cpp

@@ -52,7 +52,7 @@ namespace cv
 namespace datasets
 {
 
-class TRACK_alovImpl : public TRACK_alov
+class TRACK_alovImpl CV_FINAL : public TRACK_alov
 {
 public:
     //Constructor
@@ -62,24 +62,24 @@ public:
         frameCounter = 0;
     }
     //Destructor
-    virtual ~TRACK_alovImpl() {}
+    virtual ~TRACK_alovImpl() CV_OVERRIDE {}
 
     //Load Dataset
-    virtual void load(const string &path);
-    virtual void loadAnnotatedOnly(const std::string &path);
+    virtual void load(const string &path) CV_OVERRIDE;
+    virtual void loadAnnotatedOnly(const std::string &path) CV_OVERRIDE;
 
 protected:
-    virtual int getDatasetsNum();
+    virtual int getDatasetsNum() CV_OVERRIDE;
 
-    virtual int getDatasetLength(int id);
+    virtual int getDatasetLength(int id) CV_OVERRIDE;
 
-    virtual bool initDataset(int id);
+    virtual bool initDataset(int id) CV_OVERRIDE;
 
-    virtual bool getNextFrame(Mat &frame);
-    virtual bool getFrame(Mat &frame, int datasetID, int frameID);
+    virtual bool getNextFrame(Mat &frame) CV_OVERRIDE;
+    virtual bool getFrame(Mat &frame, int datasetID, int frameID) CV_OVERRIDE;
 
-    virtual vector <Point2f> getNextGT();
-    virtual vector <Point2f> getGT(int datasetID, int frameID);
+    virtual vector <Point2f> getNextGT() CV_OVERRIDE;
+    virtual vector <Point2f> getGT(int datasetID, int frameID) CV_OVERRIDE;
 
     void loadDataset(const string &path);
     void loadDatasetAnnotatedOnly(const string &path);

modules/datasets/src/track_vot.cpp

@@ -52,7 +52,7 @@ namespace cv
     namespace datasets
     {
 
-        class TRACK_votImpl : public TRACK_vot
+        class TRACK_votImpl CV_FINAL : public TRACK_vot
         {
         public:
             //Constructor
@@ -62,21 +62,21 @@ namespace cv
                 frameCounter = 0;
             }
             //Destructor
-            virtual ~TRACK_votImpl() {}
+            virtual ~TRACK_votImpl() CV_OVERRIDE {}
 
             //Load Dataset
-            virtual void load(const string &path);
+            virtual void load(const string &path) CV_OVERRIDE;
 
 		protected:
-            virtual int getDatasetsNum();
+            virtual int getDatasetsNum() CV_OVERRIDE;
 
-            virtual int getDatasetLength(int id);
+            virtual int getDatasetLength(int id) CV_OVERRIDE;
 
-            virtual bool initDataset(int id);
+            virtual bool initDataset(int id) CV_OVERRIDE;
 
-            virtual bool getNextFrame(Mat &frame);
+            virtual bool getNextFrame(Mat &frame) CV_OVERRIDE;
 
-            virtual vector <Point2d> getGT();
+            virtual vector <Point2d> getGT() CV_OVERRIDE;
 
             void loadDataset(const string &path);