minor changes

modules/datasets/include/opencv2/datasets/util.hpp

@@ -45,6 +45,11 @@
 #include <string>
 #include <vector>
 
+#include <cstdio>
+#include <cstdlib> // atoi, atof
+
+#include <fstream>
+
 #include <opencv2/core.hpp>
 
 namespace cv

modules/datasets/src/ar_hmdb.cpp

@@ -41,7 +41,6 @@
 
 #include "opencv2/datasets/ar_hmdb.hpp"
 #include "opencv2/datasets/util.hpp"
-#include "precomp.hpp"
 
 namespace cv
 {
@@ -50,7 +49,7 @@ namespace datasets
 
 using namespace std;
 
-class CV_EXPORTS AR_hmdbImp : public AR_hmdb
+class AR_hmdbImp : public AR_hmdb
 {
 public:
     AR_hmdbImp() {}

modules/datasets/src/ar_sports.cpp

@@ -41,7 +41,6 @@
 
 #include "opencv2/datasets/ar_sports.hpp"
 #include "opencv2/datasets/util.hpp"
-#include "precomp.hpp"
 
 namespace cv
 {
@@ -50,7 +49,7 @@ namespace datasets
 
 using namespace std;
 
-class CV_EXPORTS AR_sportsImp : public AR_sports
+class AR_sportsImp : public AR_sports
 {
 public:
     AR_sportsImp() {}

modules/datasets/src/dataset.cpp

@@ -41,7 +41,6 @@
 
 #include "opencv2/datasets/dataset.hpp"
 #include "opencv2/datasets/util.hpp"
-#include "precomp.hpp"
 
 namespace cv
 {

modules/datasets/src/fr_adience.cpp

@@ -41,7 +41,6 @@
 
 #include "opencv2/datasets/fr_adience.hpp"
 #include "opencv2/datasets/util.hpp"
-#include "precomp.hpp"
 
 namespace cv
 {
@@ -50,7 +49,7 @@ namespace datasets
 
 using namespace std;
 
-class CV_EXPORTS FR_adienceImp : public FR_adience
+class FR_adienceImp : public FR_adience
 {
 public:
     FR_adienceImp() {}

modules/datasets/src/fr_lfw.cpp

@@ -41,7 +41,6 @@
 
 #include "opencv2/datasets/fr_lfw.hpp"
 #include "opencv2/datasets/util.hpp"
-#include "precomp.hpp"
 
 #include <map>
 
@@ -52,7 +51,7 @@ namespace datasets
 
 using namespace std;
 
-class CV_EXPORTS FR_lfwImp : public FR_lfw
+class FR_lfwImp : public FR_lfw
 {
 public:
     FR_lfwImp() {}

modules/datasets/src/gr_chalearn.cpp

@@ -41,7 +41,6 @@
 
 #include "opencv2/datasets/gr_chalearn.hpp"
 #include "opencv2/datasets/util.hpp"
-#include "precomp.hpp"
 
 namespace cv
 {
@@ -50,7 +49,7 @@ namespace datasets
 
 using namespace std;
 
-class CV_EXPORTS GR_chalearnImp : public GR_chalearn
+class GR_chalearnImp : public GR_chalearn
 {
 public:
     GR_chalearnImp() {}

modules/datasets/src/gr_skig.cpp

@@ -41,7 +41,6 @@
 
 #include "opencv2/datasets/gr_skig.hpp"
 #include "opencv2/datasets/util.hpp"
-#include "precomp.hpp"
 
 #include <cstring>
 
@@ -52,7 +51,7 @@ namespace datasets
 
 using namespace std;
 
-class CV_EXPORTS GR_skigImp : public GR_skig
+class GR_skigImp : public GR_skig
 {
 public:
     GR_skigImp() {}

modules/datasets/src/hpe_humaneva.cpp

@@ -41,7 +41,6 @@
 
 #include "opencv2/datasets/hpe_humaneva.hpp"
 #include "opencv2/datasets/util.hpp"
-#include "precomp.hpp"
 
 #include <cstring>
 

modules/datasets/src/hpe_parse.cpp

@@ -41,7 +41,6 @@
 
 #include "opencv2/datasets/hpe_parse.hpp"
 #include "opencv2/datasets/util.hpp"
-#include "precomp.hpp"
 
 namespace cv
 {
@@ -50,7 +49,7 @@ namespace datasets
 
 using namespace std;
 
-class CV_EXPORTS HPE_parseImp : public HPE_parse
+class HPE_parseImp : public HPE_parse
 {
 public:
     HPE_parseImp() {}

modules/datasets/src/ir_affine.cpp

@@ -41,7 +41,6 @@
 
 #include "opencv2/datasets/ir_affine.hpp"
 #include "opencv2/datasets/util.hpp"
-#include "precomp.hpp"
 
 namespace cv
 {
@@ -50,7 +49,7 @@ namespace datasets
 
 using namespace std;
 
-class CV_EXPORTS IR_affineImp : public IR_affine
+class IR_affineImp : public IR_affine
 {
 public:
     IR_affineImp() {}

modules/datasets/src/ir_robot.cpp

@@ -41,7 +41,6 @@
 
 #include "opencv2/datasets/ir_robot.hpp"
 #include "opencv2/datasets/util.hpp"
-#include "precomp.hpp"
 
 namespace cv
 {
@@ -50,7 +49,7 @@ namespace datasets
 
 using namespace std;
 
-class CV_EXPORTS IR_robotImp : public IR_robot
+class IR_robotImp : public IR_robot
 {
 public:
     IR_robotImp() {}

modules/datasets/src/is_bsds.cpp

@@ -41,7 +41,6 @@
 
 #include "opencv2/datasets/is_bsds.hpp"
 #include "opencv2/datasets/util.hpp"
-#include "precomp.hpp"
 
 namespace cv
 {
@@ -50,7 +49,7 @@ namespace datasets
 
 using namespace std;
 
-class CV_EXPORTS IS_bsdsImp : public IS_bsds
+class IS_bsdsImp : public IS_bsds
 {
 public:
     IS_bsdsImp() {}

modules/datasets/src/is_weizmann.cpp

@@ -41,7 +41,6 @@
 
 #include "opencv2/datasets/is_weizmann.hpp"
 #include "opencv2/datasets/util.hpp"
-#include "precomp.hpp"
 
 namespace cv
 {
@@ -50,7 +49,7 @@ namespace datasets
 
 using namespace std;
 
-class CV_EXPORTS IS_weizmannImp : public IS_weizmann
+class IS_weizmannImp : public IS_weizmann
 {
 public:
     IS_weizmannImp() {}

modules/datasets/src/msm_epfl.cpp

@@ -41,7 +41,6 @@
 
 #include "opencv2/datasets/msm_epfl.hpp"
 #include "opencv2/datasets/util.hpp"
-#include "precomp.hpp"
 
 namespace cv
 {
@@ -50,7 +49,7 @@ namespace datasets
 
 using namespace std;
 
-class CV_EXPORTS MSM_epflImp : public MSM_epfl
+class MSM_epflImp : public MSM_epfl
 {
 public:
     MSM_epflImp() {}

modules/datasets/src/msm_middlebury.cpp

@@ -41,7 +41,6 @@
 
 #include "opencv2/datasets/msm_middlebury.hpp"
 #include "opencv2/datasets/util.hpp"
-#include "precomp.hpp"
 
 namespace cv
 {
@@ -50,7 +49,7 @@ namespace datasets
 
 using namespace std;
 
-class CV_EXPORTS MSM_middleburyImp : public MSM_middlebury
+class MSM_middleburyImp : public MSM_middlebury
 {
 public:
     MSM_middleburyImp() {}

modules/datasets/src/or_imagenet.cpp

@@ -41,7 +41,6 @@
 
 #include "opencv2/datasets/or_imagenet.hpp"
 #include "opencv2/datasets/util.hpp"
-#include "precomp.hpp"
 
 #include <map>
 
@@ -52,7 +51,7 @@ namespace datasets
 
 using namespace std;
 
-class CV_EXPORTS OR_imagenetImp : public OR_imagenet
+class OR_imagenetImp : public OR_imagenet
 {
 public:
     OR_imagenetImp() {}

modules/datasets/src/or_mnist.cpp

@@ -41,7 +41,6 @@
 
 #include "opencv2/datasets/or_mnist.hpp"
 #include "opencv2/datasets/util.hpp"
-#include "precomp.hpp"
 
 namespace cv
 {
@@ -50,7 +49,7 @@ namespace datasets
 
 using namespace std;
 
-class CV_EXPORTS OR_mnistImp : public OR_mnist
+class OR_mnistImp : public OR_mnist
 {
 public:
     OR_mnistImp() {}

modules/datasets/src/or_sun.cpp

@@ -41,7 +41,6 @@
 
 #include "opencv2/datasets/or_sun.hpp"
 #include "opencv2/datasets/util.hpp"
-#include "precomp.hpp"
 
 #include <map>
 
@@ -52,7 +51,7 @@ namespace datasets
 
 using namespace std;
 
-class CV_EXPORTS OR_sunImp : public OR_sun
+class OR_sunImp : public OR_sun
 {
 public:
     OR_sunImp() {}

modules/datasets/src/pd_caltech.cpp

@@ -41,7 +41,6 @@
 
 #include "opencv2/datasets/pd_caltech.hpp"
 #include "opencv2/datasets/util.hpp"
-#include "precomp.hpp"
 
 namespace cv
 {
@@ -50,7 +49,7 @@ namespace datasets
 
 using namespace std;
 
-class CV_EXPORTS PD_caltechImp : public PD_caltech
+class PD_caltechImp : public PD_caltech
 {
 public:
     PD_caltechImp() {}

modules/datasets/src/precomp.hpp

-/*M///////////////////////////////////////////////////////////////////////////////////////
-//
-//  IMPORTANT: READ BEFORE DOWNLOADING, COPYING, INSTALLING OR USING.
-//
-//  By downloading, copying, installing or using the software you agree to this license.
-//  If you do not agree to this license, do not download, install,
-//  copy or use the software.
-//
-//
-//                           License Agreement
-//                For Open Source Computer Vision Library
-//
-// Copyright (C) 2014, Itseez Inc, all rights reserved.
-// Third party copyrights are property of their respective owners.
-//
-// Redistribution and use in source and binary forms, with or without modification,
-// are permitted provided that the following conditions are met:
-//
-//   * Redistribution's of source code must retain the above copyright notice,
-//     this list of conditions and the following disclaimer.
-//
-//   * Redistribution's in binary form must reproduce the above copyright notice,
-//     this list of conditions and the following disclaimer in the documentation
-//     and/or other materials provided with the distribution.
-//
-//   * The name of the copyright holders may not be used to endorse or promote products
-//     derived from this software without specific prior written permission.
-//
-// This software is provided by the copyright holders and contributors "as is" and
-// any express or implied warranties, including, but not limited to, the implied
-// warranties of merchantability and fitness for a particular purpose are disclaimed.
-// In no event shall the Itseez Inc or contributors be liable for any direct,
-// indirect, incidental, special, exemplary, or consequential damages
-// (including, but not limited to, procurement of substitute goods or services;
-// loss of use, data, or profits; or business interruption) however caused
-// and on any theory of liability, whether in contract, strict liability,
-// or tort (including negligence or otherwise) arising in any way out of
-// the use of this software, even if advised of the possibility of such damage.
-//
-//M*/
-
-#ifndef __OPENCV_PRECOMP_H__
-#define __OPENCV_PRECOMP_H__
-
-#include <cstdio>
-#include <cstdlib> // atoi, atof
-
-#include <fstream>
-
-#endif

modules/datasets/src/slam_kitti.cpp

@@ -41,7 +41,6 @@
 
 #include "opencv2/datasets/slam_kitti.hpp"
 #include "opencv2/datasets/util.hpp"
-#include "precomp.hpp"
 
 namespace cv
 {
@@ -50,7 +49,7 @@ namespace datasets
 
 using namespace std;
 
-class CV_EXPORTS SLAM_kittiImp : public SLAM_kitti
+class SLAM_kittiImp : public SLAM_kitti
 {
 public:
     SLAM_kittiImp() {}

modules/datasets/src/slam_tumindoor.cpp

@@ -41,7 +41,6 @@
 
 #include "opencv2/datasets/slam_tumindoor.hpp"
 #include "opencv2/datasets/util.hpp"
-#include "precomp.hpp"
 
 #include <cstring>
 
@@ -52,7 +51,7 @@ namespace datasets
 
 using namespace std;
 
-class CV_EXPORTS SLAM_tumindoorImp : public SLAM_tumindoor
+class SLAM_tumindoorImp : public SLAM_tumindoor
 {
 public:
     SLAM_tumindoorImp() {}

modules/datasets/src/tr_chars.cpp

@@ -41,7 +41,6 @@
 
 #include "opencv2/datasets/tr_chars.hpp"
 #include "opencv2/datasets/util.hpp"
-#include "precomp.hpp"
 
 namespace cv
 {
@@ -50,7 +49,7 @@ namespace datasets
 
 using namespace std;
 
-class CV_EXPORTS TR_charsImp : public TR_chars
+class TR_charsImp : public TR_chars
 {
 public:
     TR_charsImp() {}

modules/datasets/src/tr_svt.cpp

@@ -41,7 +41,6 @@
 
 #include "opencv2/datasets/tr_svt.hpp"
 #include "opencv2/datasets/util.hpp"
-#include "precomp.hpp"
 
 #include <opencv2/datasets/tinyxml2/tinyxml2.h>
 
@@ -53,7 +52,7 @@ namespace datasets
 using namespace std;
 using namespace tinyxml2;
 
-class CV_EXPORTS TR_svtImp : public TR_svt
+class TR_svtImp : public TR_svt
 {
 public:
     TR_svtImp() {}