diff --git a/modules/datasets/include/opencv2/datasets/util.hpp b/modules/datasets/include/opencv2/datasets/util.hpp index 9832e7406..b1520b075 100644 --- a/modules/datasets/include/opencv2/datasets/util.hpp +++ b/modules/datasets/include/opencv2/datasets/util.hpp @@ -45,6 +45,11 @@ #include #include +#include +#include // atoi, atof + +#include + #include namespace cv diff --git a/modules/datasets/src/ar_hmdb.cpp b/modules/datasets/src/ar_hmdb.cpp index 6baa28c05..23ee4f088 100644 --- a/modules/datasets/src/ar_hmdb.cpp +++ b/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() {} diff --git a/modules/datasets/src/ar_sports.cpp b/modules/datasets/src/ar_sports.cpp index 83cf79c6b..11c8062b6 100644 --- a/modules/datasets/src/ar_sports.cpp +++ b/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() {} diff --git a/modules/datasets/src/dataset.cpp b/modules/datasets/src/dataset.cpp index 38b74167c..5c8406b9c 100644 --- a/modules/datasets/src/dataset.cpp +++ b/modules/datasets/src/dataset.cpp @@ -41,7 +41,6 @@ #include "opencv2/datasets/dataset.hpp" #include "opencv2/datasets/util.hpp" -#include "precomp.hpp" namespace cv { diff --git a/modules/datasets/src/fr_adience.cpp b/modules/datasets/src/fr_adience.cpp index 470a1fbcd..9c077ca37 100644 --- a/modules/datasets/src/fr_adience.cpp +++ b/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() {} diff --git a/modules/datasets/src/fr_lfw.cpp b/modules/datasets/src/fr_lfw.cpp index 16e0133c7..3b768d9dd 100644 --- a/modules/datasets/src/fr_lfw.cpp +++ b/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 @@ -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() {} diff --git a/modules/datasets/src/gr_chalearn.cpp b/modules/datasets/src/gr_chalearn.cpp index 7cbed3ca9..a77f22608 100644 --- a/modules/datasets/src/gr_chalearn.cpp +++ b/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() {} diff --git a/modules/datasets/src/gr_skig.cpp b/modules/datasets/src/gr_skig.cpp index 954ed509a..3bdfd71ed 100644 --- a/modules/datasets/src/gr_skig.cpp +++ b/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 @@ -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() {} diff --git a/modules/datasets/src/hpe_humaneva.cpp b/modules/datasets/src/hpe_humaneva.cpp index eb2348e99..0dfc1a06d 100644 --- a/modules/datasets/src/hpe_humaneva.cpp +++ b/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 diff --git a/modules/datasets/src/hpe_parse.cpp b/modules/datasets/src/hpe_parse.cpp index 2c37a96e0..270f5b7e8 100644 --- a/modules/datasets/src/hpe_parse.cpp +++ b/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() {} diff --git a/modules/datasets/src/ir_affine.cpp b/modules/datasets/src/ir_affine.cpp index b8946106c..185ded180 100644 --- a/modules/datasets/src/ir_affine.cpp +++ b/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() {} diff --git a/modules/datasets/src/ir_robot.cpp b/modules/datasets/src/ir_robot.cpp index 338633b46..d48aa8134 100644 --- a/modules/datasets/src/ir_robot.cpp +++ b/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() {} diff --git a/modules/datasets/src/is_bsds.cpp b/modules/datasets/src/is_bsds.cpp index b99315bc0..b4ff37796 100644 --- a/modules/datasets/src/is_bsds.cpp +++ b/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() {} diff --git a/modules/datasets/src/is_weizmann.cpp b/modules/datasets/src/is_weizmann.cpp index fc75ae742..8d09b9468 100644 --- a/modules/datasets/src/is_weizmann.cpp +++ b/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() {} diff --git a/modules/datasets/src/msm_epfl.cpp b/modules/datasets/src/msm_epfl.cpp index 663adedcb..36e5b5294 100644 --- a/modules/datasets/src/msm_epfl.cpp +++ b/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() {} diff --git a/modules/datasets/src/msm_middlebury.cpp b/modules/datasets/src/msm_middlebury.cpp index a7d520d3f..6f6eb52dd 100644 --- a/modules/datasets/src/msm_middlebury.cpp +++ b/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() {} diff --git a/modules/datasets/src/or_imagenet.cpp b/modules/datasets/src/or_imagenet.cpp index 9d257da29..05687b851 100644 --- a/modules/datasets/src/or_imagenet.cpp +++ b/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 @@ -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() {} diff --git a/modules/datasets/src/or_mnist.cpp b/modules/datasets/src/or_mnist.cpp index cc721ee15..e85266c1e 100644 --- a/modules/datasets/src/or_mnist.cpp +++ b/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() {} diff --git a/modules/datasets/src/or_sun.cpp b/modules/datasets/src/or_sun.cpp index ab8757bfb..305eb2177 100644 --- a/modules/datasets/src/or_sun.cpp +++ b/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 @@ -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() {} diff --git a/modules/datasets/src/pd_caltech.cpp b/modules/datasets/src/pd_caltech.cpp index 74c596d44..b3660b8d6 100644 --- a/modules/datasets/src/pd_caltech.cpp +++ b/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() {} diff --git a/modules/datasets/src/precomp.hpp b/modules/datasets/src/precomp.hpp deleted file mode 100644 index da5bf8b83..000000000 --- a/modules/datasets/src/precomp.hpp +++ /dev/null @@ -1,50 +0,0 @@ -/*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 -#include // atoi, atof - -#include - -#endif diff --git a/modules/datasets/src/slam_kitti.cpp b/modules/datasets/src/slam_kitti.cpp index ca1904d3e..e1d82555c 100644 --- a/modules/datasets/src/slam_kitti.cpp +++ b/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() {} diff --git a/modules/datasets/src/slam_tumindoor.cpp b/modules/datasets/src/slam_tumindoor.cpp index cdc354314..8db891658 100644 --- a/modules/datasets/src/slam_tumindoor.cpp +++ b/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 @@ -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() {} diff --git a/modules/datasets/src/tr_chars.cpp b/modules/datasets/src/tr_chars.cpp index 5291c5bc8..261bf3a6c 100644 --- a/modules/datasets/src/tr_chars.cpp +++ b/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() {} diff --git a/modules/datasets/src/tr_svt.cpp b/modules/datasets/src/tr_svt.cpp index b2e11e788..af853d479 100644 --- a/modules/datasets/src/tr_svt.cpp +++ b/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 @@ -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() {}