opencv/opencv_contrib
1
0
Fork 0
mirror of https://github.com/opencv/opencv_contrib.git synced 2025-10-24 03:03:35 +08:00
Code Issues Releases Wiki Activity

datasets: apply CV_OVERRIDE/CV_FINAL

Browse Source
This commit is contained in:
Alexander Alekhin
2018-03-21 16:58:04 +03:00
parent 8af62cd606
commit 55767bfcda
55 changed files with 143 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
modules/datasets/src/or_pascal.cpp
View File

@@ -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);