diff --git a/modules/datasets/CMakeLists.txt b/modules/datasets/CMakeLists.txt new file mode 100644 index 000000000..3c82ba2da --- /dev/null +++ b/modules/datasets/CMakeLists.txt @@ -0,0 +1,3 @@ +set(the_description "datasets framework") +ocv_define_module(datasets opencv_core opencv_face) + diff --git a/modules/datasetstools/doc/datasetstools.rst b/modules/datasets/doc/datasets.rst similarity index 78% rename from modules/datasetstools/doc/datasetstools.rst rename to modules/datasets/doc/datasets.rst index ca690e104..6bf2bd8c8 100644 --- a/modules/datasetstools/doc/datasetstools.rst +++ b/modules/datasets/doc/datasets.rst @@ -1,10 +1,10 @@ ********************************************************* -datasetstools. Tools for working with different datasets. +datasets. Framework for working with different datasets. ********************************************************* .. highlight:: cpp -The datasetstools module includes classes for working with different datasets. +The datasets module includes classes for working with different datasets. Action Recognition ------------------ @@ -23,7 +23,7 @@ _`"HMDB: A Large Human Motion Database"`: http://serre-lab.clps.brown.edu/resour 2. Unpack them. - 3. To load data run: ./opencv/build/bin/example_datasetstools_ar_hmdb -p=/home/user/path_to_unpacked_folders/ + 3. To load data run: ./opencv/build/bin/example_datasets_ar_hmdb -p=/home/user/path_to_unpacked_folders/ AR_sports ========= @@ -37,7 +37,7 @@ _`"Sports-1M Dataset"`: http://cs.stanford.edu/people/karpathy/deepvideo/ 1. From link above download dataset files (git clone https://code.google.com/p/sports-1m-dataset/). - 2. To load data run: ./opencv/build/bin/example_datasetstools_ar_sports -p=/home/user/path_to_downloaded_folders/ + 2. To load data run: ./opencv/build/bin/example_datasets_ar_sports -p=/home/user/path_to_downloaded_folders/ Face Recognition ---------------- @@ -52,16 +52,16 @@ _`"Labeled Faces in the Wild"`: http://vis-www.cs.umass.edu/lfw/ .. note:: Usage - 1. From link above download any dataset file: lfw.tgz\lfwa.tar.gz\lfw-deepfunneled.tgz\lfw-funneled.tgz and files with pairs: with 10 test splits: pairs.txt and with developer train split: pairsDevTrain.txt. + 1. From link above download any dataset file: lfw.tgz\lfwa.tar.gz\lfw-deepfunneled.tgz\lfw-funneled.tgz and files with pairs: 10 test splits: pairs.txt and developer train split: pairsDevTrain.txt. 2. Unpack dataset file and place pairs.txt and pairsDevTrain.txt in created folder. - 3. To load data run: ./opencv/build/bin/example_datasetstools_fr_lfw -p=/home/user/path_to_unpacked_folder/lfw2/ + 3. To load data run: ./opencv/build/bin/example_datasets_fr_lfw -p=/home/user/path_to_unpacked_folder/lfw2/ .. note:: Benchmark - For this dataset was implemented benchmark, which gives accuracy: 0.623833 +- 0.005223 (train split: pairsDevTrain.txt, dataset: lfwa) - - To run this benchmark execute: ./opencv/build/bin/example_datasetstools_fr_lfw_benchmark -p=/home/user/path_to_unpacked_folder/lfw2/ + - To run this benchmark execute: ./opencv/build/bin/example_datasets_fr_lfw_benchmark -p=/home/user/path_to_unpacked_folder/lfw2/ Gesture Recognition ------------------- @@ -82,7 +82,7 @@ _`"ChaLearn Looking at People"`: http://gesture.chalearn.org/ 3. Unpack all archives in Train/ & Validation/ in the folders with the same names, for example: Sample0001.zip to Sample0001/ - 4. To load data run: ./opencv/build/bin/example_datasetstools_gr_chalearn -p=/home/user/path_to_unpacked_folders/ + 4. To load data run: ./opencv/build/bin/example_datasets_gr_chalearn -p=/home/user/path_to_unpacked_folders/ GR_skig ======= @@ -98,7 +98,7 @@ _`"Sheffield Kinect Gesture Dataset"`: http://lshao.staff.shef.ac.uk/data/Sheffi 2. Unpack them. - 3. To load data run: ./opencv/build/bin/example_datasetstools_gr_skig -p=/home/user/path_to_unpacked_folders/ + 3. To load data run: ./opencv/build/bin/example_datasets_gr_skig -p=/home/user/path_to_unpacked_folders/ Human Pose Estimation --------------------- @@ -117,7 +117,7 @@ _`"PARSE Dataset"`: http://www.ics.uci.edu/~dramanan/papers/parse/ 2. Unpack it. - 3. To load data run: ./opencv/build/bin/example_datasetstools_hpe_parse -p=/home/user/path_to_unpacked_folder/people_all/ + 3. To load data run: ./opencv/build/bin/example_datasets_hpe_parse -p=/home/user/path_to_unpacked_folder/people_all/ Image Registration ------------------ @@ -136,7 +136,7 @@ _`"Affine Covariant Regions Datasets"`: http://www.robots.ox.ac.uk/~vgg/data/dat 2. Unpack them. - 3. To load data, for example, for "bark", run: ./opencv/build/bin/example_datasetstools_ir_affine -p=/home/user/path_to_unpacked_folder/bark/ + 3. To load data, for example, for "bark", run: ./opencv/build/bin/example_datasets_ir_affine -p=/home/user/path_to_unpacked_folder/bark/ IR_robot ======== @@ -151,7 +151,7 @@ _`"Robot Data Set"`: http://roboimagedata.compute.dtu.dk/?page_id=24 1. From link above download files for dataset "Point Feature Data Set – 2010": SET001_6.tar.gz-SET055_60.tar.gz (there are two data sets: - Full resolution images (1200×1600), ~500 Gb and - Half size image (600×800), ~115 Gb.) 2. Unpack them to one folder. - 3. To load data run: ./opencv/build/bin/example_datasetstools_ir_robot -p=/home/user/path_to_unpacked_folder/ + 3. To load data run: ./opencv/build/bin/example_datasets_ir_robot -p=/home/user/path_to_unpacked_folder/ Image Segmentation ------------------ @@ -170,7 +170,7 @@ _`"The Berkeley Segmentation Dataset and Benchmark"`: https://www.eecs.berkeley. 2. Unpack them. - 3. To load data run: ./opencv/build/bin/example_datasetstools_is_bsds -p=/home/user/path_to_unpacked_folder/BSDS300/ + 3. To load data run: ./opencv/build/bin/example_datasets_is_bsds -p=/home/user/path_to_unpacked_folder/BSDS300/ IS_weizmann =========== @@ -186,7 +186,7 @@ _`"Weizmann Segmentation Evaluation Database"`: http://www.wisdom.weizmann.ac.il 2. Unpack them. - 3. To load data, for example, for 1 object dataset, run: ./opencv/build/bin/example_datasetstools_is_weizmann -p=/home/user/path_to_unpacked_folder/1obj/ + 3. To load data, for example, for 1 object dataset, run: ./opencv/build/bin/example_datasets_is_weizmann -p=/home/user/path_to_unpacked_folder/1obj/ Multiview Stereo Matching ------------------------- @@ -205,7 +205,7 @@ _`"EPFL Multi-View Stereo"`: http://cvlabwww.epfl.ch/~strecha/multiview/denseMVS 2. Unpack them in separate folder for each object. For example, for "fountain", in folder fountain/ : fountain_dense_bounding.tar.gz -> bounding/, fountain_dense_cameras.tar.gz -> camera/, fountain_dense_images.tar.gz -> png/, fountain_dense_p.tar.gz -> P/ - 3. To load data, for example, for "fountain", run: ./opencv/build/bin/example_datasetstools_msm_epfl -p=/home/user/path_to_unpacked_folder/fountain/ + 3. To load data, for example, for "fountain", run: ./opencv/build/bin/example_datasets_msm_epfl -p=/home/user/path_to_unpacked_folder/fountain/ MSM_middlebury ============== @@ -221,7 +221,7 @@ _`"Stereo – Middlebury Computer Vision"`: http://vision.middlebury.edu/mview/ 2. Unpack them. - 3. To load data, for example "temple" dataset, run: ./opencv/build/bin/example_datasetstools_msm_middlebury -p=/home/user/path_to_unpacked_folder/temple/ + 3. To load data, for example "temple" dataset, run: ./opencv/build/bin/example_datasets_msm_middlebury -p=/home/user/path_to_unpacked_folder/temple/ Object Recognition ------------------ @@ -242,7 +242,7 @@ Currently implemented loading full list with urls. Planned to implement dataset 2. Unpack it. - 3. To load data run: ./opencv/build/bin/example_datasetstools_or_imagenet -p=/home/user/path_to_unpacked_file/ + 3. To load data run: ./opencv/build/bin/example_datasets_or_imagenet -p=/home/user/path_to_unpacked_file/ OR_mnist =========== @@ -258,7 +258,7 @@ _`"MNIST"`: http://yann.lecun.com/exdb/mnist/ 2. Unpack them. - 3. To load data run: ./opencv/build/bin/example_datasetstools_or_mnist -p=/home/user/path_to_unpacked_files/ + 3. To load data run: ./opencv/build/bin/example_datasets_or_mnist -p=/home/user/path_to_unpacked_files/ OR_sun ====== @@ -276,7 +276,7 @@ Currently implemented loading "Scene Recognition Benchmark. SUN397". Planned to 2. Unpack it. - 3. To load data run: ./opencv/build/bin/example_datasetstools_or_sun -p=/home/user/path_to_unpacked_folder/SUN397/ + 3. To load data run: ./opencv/build/bin/example_datasets_or_sun -p=/home/user/path_to_unpacked_folder/SUN397/ SLAM ---- @@ -295,7 +295,7 @@ _`"KITTI Vision Benchmark"`: http://www.cvlibs.net/datasets/kitti/eval_odometry. 2. Unpack data_odometry_poses.zip, it creates folder dataset/poses/. After that unpack data_odometry_gray.zip, data_odometry_color.zip, data_odometry_velodyne.zip. Folder dataset/sequences/ will be created with folders 00/..21/. Each of these folders will contain: image_0/, image_1/, image_2/, image_3/, velodyne/ and files calib.txt & times.txt. These two last files will be replaced after unpacking data_odometry_calib.zip at the end. - 3. To load data run: ./opencv/build/bin/example_datasetstools_slam_kitti -p=/home/user/path_to_unpacked_folder/dataset/ + 3. To load data run: ./opencv/build/bin/example_datasets_slam_kitti -p=/home/user/path_to_unpacked_folder/dataset/ SLAM_tumindoor ============== @@ -311,7 +311,7 @@ _`"TUMindoor Dataset"`: http://www.navvis.lmt.ei.tum.de/dataset/ 2. Unpack them in separate folder for each dataset. dslr.tar.bz2 -> dslr/, info.tar.bz2 -> info/, ladybug.tar.bz2 -> ladybug/, pointcloud.tar.bz2 -> pointcloud/. - 3. To load each dataset run: ./opencv/build/bin/example_datasetstools_slam_tumindoor -p=/home/user/path_to_unpacked_folders/ + 3. To load each dataset run: ./opencv/build/bin/example_datasets_slam_tumindoor -p=/home/user/path_to_unpacked_folders/ Text Recognition ---------------- @@ -332,7 +332,7 @@ _`"The Chars74K Dataset"`: http://www.ee.surrey.ac.uk/CVSSP/demos/chars74k/ 3. Move .m files from folder ListsTXT/ to appropriate folder. For example, English/list_English_Img.m for EnglishImg.tgz. - 4. To load data, for example "EnglishImg", run: ./opencv/build/bin/example_datasetstools_tr_chars -p=/home/user/path_to_unpacked_folder/English/ + 4. To load data, for example "EnglishImg", run: ./opencv/build/bin/example_datasets_tr_chars -p=/home/user/path_to_unpacked_folder/English/ TR_svt ====== @@ -348,5 +348,5 @@ _`"The Street View Text Dataset"`: http://vision.ucsd.edu/~kai/svt/ 2. Unpack it. - 3. To load data run: ./opencv/build/bin/example_datasetstools_tr_svt -p=/home/user/path_to_unpacked_folder/svt/svt1/ + 3. To load data run: ./opencv/build/bin/example_datasets_tr_svt -p=/home/user/path_to_unpacked_folder/svt/svt1/ diff --git a/modules/datasetstools/include/opencv2/datasetstools/ar_hmdb.hpp b/modules/datasets/include/opencv2/datasets/ar_hmdb.hpp similarity index 94% rename from modules/datasetstools/include/opencv2/datasetstools/ar_hmdb.hpp rename to modules/datasets/include/opencv2/datasets/ar_hmdb.hpp index 85e159702..9264503ef 100644 --- a/modules/datasetstools/include/opencv2/datasetstools/ar_hmdb.hpp +++ b/modules/datasets/include/opencv2/datasets/ar_hmdb.hpp @@ -39,19 +39,19 @@ // //M*/ -#ifndef OPENCV_DATASETSTOOLS_AR_HMDB_HPP -#define OPENCV_DATASETSTOOLS_AR_HMDB_HPP +#ifndef OPENCV_DATASETS_AR_HMDB_HPP +#define OPENCV_DATASETS_AR_HMDB_HPP #include #include -#include "opencv2/datasetstools/dataset.hpp" +#include "opencv2/datasets/dataset.hpp" #include namespace cv { -namespace datasetstools +namespace datasets { struct AR_hmdbObj : public Object diff --git a/modules/datasetstools/include/opencv2/datasetstools/ar_sports.hpp b/modules/datasets/include/opencv2/datasets/ar_sports.hpp similarity index 93% rename from modules/datasetstools/include/opencv2/datasetstools/ar_sports.hpp rename to modules/datasets/include/opencv2/datasets/ar_sports.hpp index 408e2fca5..9d047a14f 100644 --- a/modules/datasetstools/include/opencv2/datasetstools/ar_sports.hpp +++ b/modules/datasets/include/opencv2/datasets/ar_sports.hpp @@ -39,19 +39,19 @@ // //M*/ -#ifndef OPENCV_DATASETSTOOLS_AR_SPORTS_HPP -#define OPENCV_DATASETSTOOLS_AR_SPORTS_HPP +#ifndef OPENCV_DATASETS_AR_SPORTS_HPP +#define OPENCV_DATASETS_AR_SPORTS_HPP #include #include -#include "opencv2/datasetstools/dataset.hpp" +#include "opencv2/datasets/dataset.hpp" #include namespace cv { -namespace datasetstools +namespace datasets { struct AR_sportsObj : public Object diff --git a/modules/datasetstools/include/opencv2/datasetstools/dataset.hpp b/modules/datasets/include/opencv2/datasets/dataset.hpp similarity index 96% rename from modules/datasetstools/include/opencv2/datasetstools/dataset.hpp rename to modules/datasets/include/opencv2/datasets/dataset.hpp index 9cb1e7381..f9e94bffd 100644 --- a/modules/datasetstools/include/opencv2/datasetstools/dataset.hpp +++ b/modules/datasets/include/opencv2/datasets/dataset.hpp @@ -39,8 +39,8 @@ // //M*/ -#ifndef OPENCV_DATASETSTOOLS_DATASET_HPP -#define OPENCV_DATASETSTOOLS_DATASET_HPP +#ifndef OPENCV_DATASETS_DATASET_HPP +#define OPENCV_DATASETS_DATASET_HPP #include #include @@ -49,7 +49,7 @@ namespace cv { -namespace datasetstools +namespace datasets { struct Object diff --git a/modules/datasetstools/include/opencv2/datasetstools/fr_lfw.hpp b/modules/datasets/include/opencv2/datasets/fr_lfw.hpp similarity index 94% rename from modules/datasetstools/include/opencv2/datasetstools/fr_lfw.hpp rename to modules/datasets/include/opencv2/datasets/fr_lfw.hpp index dbc0a499a..8e013554e 100644 --- a/modules/datasetstools/include/opencv2/datasetstools/fr_lfw.hpp +++ b/modules/datasets/include/opencv2/datasets/fr_lfw.hpp @@ -39,19 +39,19 @@ // //M*/ -#ifndef OPENCV_DATASETSTOOLS_FR_LFW_HPP -#define OPENCV_DATASETSTOOLS_FR_LFW_HPP +#ifndef OPENCV_DATASETS_FR_LFW_HPP +#define OPENCV_DATASETS_FR_LFW_HPP #include #include -#include "opencv2/datasetstools/dataset.hpp" +#include "opencv2/datasets/dataset.hpp" #include namespace cv { -namespace datasetstools +namespace datasets { struct FR_lfwObj : public Object diff --git a/modules/datasetstools/include/opencv2/datasetstools/gr_chalearn.hpp b/modules/datasets/include/opencv2/datasets/gr_chalearn.hpp similarity index 94% rename from modules/datasetstools/include/opencv2/datasetstools/gr_chalearn.hpp rename to modules/datasets/include/opencv2/datasets/gr_chalearn.hpp index efadb605d..3f79f9542 100644 --- a/modules/datasetstools/include/opencv2/datasetstools/gr_chalearn.hpp +++ b/modules/datasets/include/opencv2/datasets/gr_chalearn.hpp @@ -39,19 +39,19 @@ // //M*/ -#ifndef OPENCV_DATASETSTOOLS_GR_CHALEARN_HPP -#define OPENCV_DATASETSTOOLS_GR_CHALEARN_HPP +#ifndef OPENCV_DATASETS_GR_CHALEARN_HPP +#define OPENCV_DATASETS_GR_CHALEARN_HPP #include #include -#include "opencv2/datasetstools/dataset.hpp" +#include "opencv2/datasets/dataset.hpp" #include namespace cv { -namespace datasetstools +namespace datasets { struct groundTruth diff --git a/modules/datasetstools/include/opencv2/datasetstools/gr_skig.hpp b/modules/datasets/include/opencv2/datasets/gr_skig.hpp similarity index 94% rename from modules/datasetstools/include/opencv2/datasetstools/gr_skig.hpp rename to modules/datasets/include/opencv2/datasets/gr_skig.hpp index 79cfcdeb4..b4b34808d 100644 --- a/modules/datasetstools/include/opencv2/datasetstools/gr_skig.hpp +++ b/modules/datasets/include/opencv2/datasets/gr_skig.hpp @@ -39,19 +39,19 @@ // //M*/ -#ifndef OPENCV_DATASETSTOOLS_GR_SKIG_HPP -#define OPENCV_DATASETSTOOLS_GR_SKIG_HPP +#ifndef OPENCV_DATASETS_GR_SKIG_HPP +#define OPENCV_DATASETS_GR_SKIG_HPP #include #include -#include "opencv2/datasetstools/dataset.hpp" +#include "opencv2/datasets/dataset.hpp" #include namespace cv { -namespace datasetstools +namespace datasets { enum actionType diff --git a/modules/datasetstools/include/opencv2/datasetstools/hpe_parse.hpp b/modules/datasets/include/opencv2/datasets/hpe_parse.hpp similarity index 93% rename from modules/datasetstools/include/opencv2/datasetstools/hpe_parse.hpp rename to modules/datasets/include/opencv2/datasets/hpe_parse.hpp index 7d1d1b15a..5f027a1dc 100644 --- a/modules/datasetstools/include/opencv2/datasetstools/hpe_parse.hpp +++ b/modules/datasets/include/opencv2/datasets/hpe_parse.hpp @@ -39,19 +39,19 @@ // //M*/ -#ifndef OPENCV_DATASETSTOOLS_HPE_PARSE_HPP -#define OPENCV_DATASETSTOOLS_HPE_PARSE_HPP +#ifndef OPENCV_DATASETS_HPE_PARSE_HPP +#define OPENCV_DATASETS_HPE_PARSE_HPP #include #include -#include "opencv2/datasetstools/dataset.hpp" +#include "opencv2/datasets/dataset.hpp" #include namespace cv { -namespace datasetstools +namespace datasets { struct HPE_parseObj : public Object diff --git a/modules/datasetstools/include/opencv2/datasetstools/ir_affine.hpp b/modules/datasets/include/opencv2/datasets/ir_affine.hpp similarity index 94% rename from modules/datasetstools/include/opencv2/datasetstools/ir_affine.hpp rename to modules/datasets/include/opencv2/datasets/ir_affine.hpp index b3cc8782a..1ee51a2a9 100644 --- a/modules/datasetstools/include/opencv2/datasetstools/ir_affine.hpp +++ b/modules/datasets/include/opencv2/datasets/ir_affine.hpp @@ -39,20 +39,20 @@ // //M*/ -#ifndef OPENCV_DATASETSTOOLS_IR_AFFINE_HPP -#define OPENCV_DATASETSTOOLS_IR_AFFINE_HPP +#ifndef OPENCV_DATASETS_IR_AFFINE_HPP +#define OPENCV_DATASETS_IR_AFFINE_HPP #include #include -#include "opencv2/datasetstools/dataset.hpp" +#include "opencv2/datasets/dataset.hpp" #include #include namespace cv { -namespace datasetstools +namespace datasets { struct IR_affineObj : public Object diff --git a/modules/datasetstools/include/opencv2/datasetstools/ir_robot.hpp b/modules/datasets/include/opencv2/datasets/ir_robot.hpp similarity index 94% rename from modules/datasetstools/include/opencv2/datasetstools/ir_robot.hpp rename to modules/datasets/include/opencv2/datasets/ir_robot.hpp index fe319ba14..ac25b6f3c 100644 --- a/modules/datasetstools/include/opencv2/datasetstools/ir_robot.hpp +++ b/modules/datasets/include/opencv2/datasets/ir_robot.hpp @@ -39,19 +39,19 @@ // //M*/ -#ifndef OPENCV_DATASETSTOOLS_IR_ROBOT_HPP -#define OPENCV_DATASETSTOOLS_IR_ROBOT_HPP +#ifndef OPENCV_DATASETS_IR_ROBOT_HPP +#define OPENCV_DATASETS_IR_ROBOT_HPP #include #include -#include "opencv2/datasetstools/dataset.hpp" +#include "opencv2/datasets/dataset.hpp" #include namespace cv { -namespace datasetstools +namespace datasets { // calibration matrix from calibrationFile.mat diff --git a/modules/datasetstools/include/opencv2/datasetstools/is_bsds.hpp b/modules/datasets/include/opencv2/datasets/is_bsds.hpp similarity index 94% rename from modules/datasetstools/include/opencv2/datasetstools/is_bsds.hpp rename to modules/datasets/include/opencv2/datasets/is_bsds.hpp index 880b2fcb7..72802e7e8 100644 --- a/modules/datasetstools/include/opencv2/datasetstools/is_bsds.hpp +++ b/modules/datasets/include/opencv2/datasets/is_bsds.hpp @@ -39,19 +39,19 @@ // //M*/ -#ifndef OPENCV_DATASETSTOOLS_IS_BSDS_HPP -#define OPENCV_DATASETSTOOLS_IS_BSDS_HPP +#ifndef OPENCV_DATASETS_IS_BSDS_HPP +#define OPENCV_DATASETS_IS_BSDS_HPP #include #include -#include "opencv2/datasetstools/dataset.hpp" +#include "opencv2/datasets/dataset.hpp" #include namespace cv { -namespace datasetstools +namespace datasets { struct IS_bsdsObj : public Object diff --git a/modules/datasetstools/include/opencv2/datasetstools/is_weizmann.hpp b/modules/datasets/include/opencv2/datasets/is_weizmann.hpp similarity index 94% rename from modules/datasetstools/include/opencv2/datasetstools/is_weizmann.hpp rename to modules/datasets/include/opencv2/datasets/is_weizmann.hpp index 66184489f..f374282b1 100644 --- a/modules/datasetstools/include/opencv2/datasetstools/is_weizmann.hpp +++ b/modules/datasets/include/opencv2/datasets/is_weizmann.hpp @@ -39,19 +39,19 @@ // //M*/ -#ifndef OPENCV_DATASETSTOOLS_IS_WEIZMANN_HPP -#define OPENCV_DATASETSTOOLS_IS_WEIZMANN_HPP +#ifndef OPENCV_DATASETS_IS_WEIZMANN_HPP +#define OPENCV_DATASETS_IS_WEIZMANN_HPP #include #include -#include "opencv2/datasetstools/dataset.hpp" +#include "opencv2/datasets/dataset.hpp" #include namespace cv { -namespace datasetstools +namespace datasets { struct IS_weizmannObj : public Object diff --git a/modules/datasetstools/include/opencv2/datasetstools/msm_epfl.hpp b/modules/datasets/include/opencv2/datasets/msm_epfl.hpp similarity index 94% rename from modules/datasetstools/include/opencv2/datasetstools/msm_epfl.hpp rename to modules/datasets/include/opencv2/datasets/msm_epfl.hpp index 1aecf6f66..e1785b0b2 100644 --- a/modules/datasetstools/include/opencv2/datasetstools/msm_epfl.hpp +++ b/modules/datasets/include/opencv2/datasets/msm_epfl.hpp @@ -39,19 +39,19 @@ // //M*/ -#ifndef OPENCV_DATASETSTOOLS_MSM_EPFL_HPP -#define OPENCV_DATASETSTOOLS_MSM_EPFL_HPP +#ifndef OPENCV_DATASETS_MSM_EPFL_HPP +#define OPENCV_DATASETS_MSM_EPFL_HPP #include #include -#include "opencv2/datasetstools/dataset.hpp" +#include "opencv2/datasets/dataset.hpp" #include namespace cv { -namespace datasetstools +namespace datasets { struct cameraParam diff --git a/modules/datasetstools/include/opencv2/datasetstools/msm_middlebury.hpp b/modules/datasets/include/opencv2/datasets/msm_middlebury.hpp similarity index 93% rename from modules/datasetstools/include/opencv2/datasetstools/msm_middlebury.hpp rename to modules/datasets/include/opencv2/datasets/msm_middlebury.hpp index cbfbb38be..7af024e96 100644 --- a/modules/datasetstools/include/opencv2/datasetstools/msm_middlebury.hpp +++ b/modules/datasets/include/opencv2/datasets/msm_middlebury.hpp @@ -39,19 +39,19 @@ // //M*/ -#ifndef OPENCV_DATASETSTOOLS_MSM_MIDDLEBURY_HPP -#define OPENCV_DATASETSTOOLS_MSM_MIDDLEBURY_HPP +#ifndef OPENCV_DATASETS_MSM_MIDDLEBURY_HPP +#define OPENCV_DATASETS_MSM_MIDDLEBURY_HPP #include #include -#include "opencv2/datasetstools/dataset.hpp" +#include "opencv2/datasets/dataset.hpp" #include namespace cv { -namespace datasetstools +namespace datasets { struct MSM_middleburyObj : public Object diff --git a/modules/datasetstools/include/opencv2/datasetstools/or_imagenet.hpp b/modules/datasets/include/opencv2/datasets/or_imagenet.hpp similarity index 93% rename from modules/datasetstools/include/opencv2/datasetstools/or_imagenet.hpp rename to modules/datasets/include/opencv2/datasets/or_imagenet.hpp index ac401f930..2c6b74465 100644 --- a/modules/datasetstools/include/opencv2/datasetstools/or_imagenet.hpp +++ b/modules/datasets/include/opencv2/datasets/or_imagenet.hpp @@ -39,19 +39,19 @@ // //M*/ -#ifndef OPENCV_DATASETSTOOLS_OR_IMAGENET_HPP -#define OPENCV_DATASETSTOOLS_OR_IMAGENET_HPP +#ifndef OPENCV_DATASETS_OR_IMAGENET_HPP +#define OPENCV_DATASETS_OR_IMAGENET_HPP #include #include -#include "opencv2/datasetstools/dataset.hpp" +#include "opencv2/datasets/dataset.hpp" #include namespace cv { -namespace datasetstools +namespace datasets { struct OR_imagenetObj : public Object diff --git a/modules/datasetstools/include/opencv2/datasetstools/or_mnist.hpp b/modules/datasets/include/opencv2/datasets/or_mnist.hpp similarity index 94% rename from modules/datasetstools/include/opencv2/datasetstools/or_mnist.hpp rename to modules/datasets/include/opencv2/datasets/or_mnist.hpp index 89763c5ee..9c946ffa3 100644 --- a/modules/datasetstools/include/opencv2/datasetstools/or_mnist.hpp +++ b/modules/datasets/include/opencv2/datasets/or_mnist.hpp @@ -39,19 +39,19 @@ // //M*/ -#ifndef OPENCV_DATASETSTOOLS_OR_MNIST_HPP -#define OPENCV_DATASETSTOOLS_OR_MNIST_HPP +#ifndef OPENCV_DATASETS_OR_MNIST_HPP +#define OPENCV_DATASETS_OR_MNIST_HPP #include #include -#include "opencv2/datasetstools/dataset.hpp" +#include "opencv2/datasets/dataset.hpp" #include namespace cv { -namespace datasetstools +namespace datasets { struct OR_mnistObj : public Object diff --git a/modules/datasetstools/include/opencv2/datasetstools/or_sun.hpp b/modules/datasets/include/opencv2/datasets/or_sun.hpp similarity index 94% rename from modules/datasetstools/include/opencv2/datasetstools/or_sun.hpp rename to modules/datasets/include/opencv2/datasets/or_sun.hpp index f231d6d20..be438d4de 100644 --- a/modules/datasetstools/include/opencv2/datasetstools/or_sun.hpp +++ b/modules/datasets/include/opencv2/datasets/or_sun.hpp @@ -39,19 +39,19 @@ // //M*/ -#ifndef OPENCV_DATASETSTOOLS_OR_SUN_HPP -#define OPENCV_DATASETSTOOLS_OR_SUN_HPP +#ifndef OPENCV_DATASETS_OR_SUN_HPP +#define OPENCV_DATASETS_OR_SUN_HPP #include #include -#include "opencv2/datasetstools/dataset.hpp" +#include "opencv2/datasets/dataset.hpp" #include namespace cv { -namespace datasetstools +namespace datasets { struct OR_sunObj : public Object diff --git a/modules/datasetstools/include/opencv2/datasetstools/slam_kitti.hpp b/modules/datasets/include/opencv2/datasets/slam_kitti.hpp similarity index 94% rename from modules/datasetstools/include/opencv2/datasetstools/slam_kitti.hpp rename to modules/datasets/include/opencv2/datasets/slam_kitti.hpp index f133eb134..b001e8db7 100644 --- a/modules/datasetstools/include/opencv2/datasetstools/slam_kitti.hpp +++ b/modules/datasets/include/opencv2/datasets/slam_kitti.hpp @@ -39,19 +39,19 @@ // //M*/ -#ifndef OPENCV_DATASETSTOOLS_SLAM_KITTI_HPP -#define OPENCV_DATASETSTOOLS_SLAM_KITTI_HPP +#ifndef OPENCV_DATASETS_SLAM_KITTI_HPP +#define OPENCV_DATASETS_SLAM_KITTI_HPP #include #include -#include "opencv2/datasetstools/dataset.hpp" +#include "opencv2/datasets/dataset.hpp" #include namespace cv { -namespace datasetstools +namespace datasets { struct pose diff --git a/modules/datasetstools/include/opencv2/datasetstools/slam_tumindoor.hpp b/modules/datasets/include/opencv2/datasets/slam_tumindoor.hpp similarity index 93% rename from modules/datasetstools/include/opencv2/datasetstools/slam_tumindoor.hpp rename to modules/datasets/include/opencv2/datasets/slam_tumindoor.hpp index 4945dca33..d743cd646 100644 --- a/modules/datasetstools/include/opencv2/datasetstools/slam_tumindoor.hpp +++ b/modules/datasets/include/opencv2/datasets/slam_tumindoor.hpp @@ -39,19 +39,19 @@ // //M*/ -#ifndef OPENCV_DATASETSTOOLS_SLAM_TUMINDOOR_HPP -#define OPENCV_DATASETSTOOLS_SLAM_TUMINDOOR_HPP +#ifndef OPENCV_DATASETS_SLAM_TUMINDOOR_HPP +#define OPENCV_DATASETS_SLAM_TUMINDOOR_HPP #include #include -#include "opencv2/datasetstools/dataset.hpp" +#include "opencv2/datasets/dataset.hpp" #include namespace cv { -namespace datasetstools +namespace datasets { enum imageType diff --git a/modules/datasetstools/include/opencv2/datasetstools/tinyxml2/tinyxml2.h b/modules/datasets/include/opencv2/datasets/tinyxml2/tinyxml2.h similarity index 100% rename from modules/datasetstools/include/opencv2/datasetstools/tinyxml2/tinyxml2.h rename to modules/datasets/include/opencv2/datasets/tinyxml2/tinyxml2.h diff --git a/modules/datasetstools/include/opencv2/datasetstools/tr_chars.hpp b/modules/datasets/include/opencv2/datasets/tr_chars.hpp similarity index 94% rename from modules/datasetstools/include/opencv2/datasetstools/tr_chars.hpp rename to modules/datasets/include/opencv2/datasets/tr_chars.hpp index c8207b45f..6b7f81885 100644 --- a/modules/datasetstools/include/opencv2/datasetstools/tr_chars.hpp +++ b/modules/datasets/include/opencv2/datasets/tr_chars.hpp @@ -39,19 +39,19 @@ // //M*/ -#ifndef OPENCV_DATASETSTOOLS_TR_CHARS_HPP -#define OPENCV_DATASETSTOOLS_TR_CHARS_HPP +#ifndef OPENCV_DATASETS_TR_CHARS_HPP +#define OPENCV_DATASETS_TR_CHARS_HPP #include #include -#include "opencv2/datasetstools/dataset.hpp" +#include "opencv2/datasets/dataset.hpp" #include namespace cv { -namespace datasetstools +namespace datasets { struct TR_charsObj : public Object diff --git a/modules/datasetstools/include/opencv2/datasetstools/tr_svt.hpp b/modules/datasets/include/opencv2/datasets/tr_svt.hpp similarity index 94% rename from modules/datasetstools/include/opencv2/datasetstools/tr_svt.hpp rename to modules/datasets/include/opencv2/datasets/tr_svt.hpp index eb014af95..23b583d92 100644 --- a/modules/datasetstools/include/opencv2/datasetstools/tr_svt.hpp +++ b/modules/datasets/include/opencv2/datasets/tr_svt.hpp @@ -39,19 +39,19 @@ // //M*/ -#ifndef OPENCV_DATASETSTOOLS_TR_SVT_HPP -#define OPENCV_DATASETSTOOLS_TR_SVT_HPP +#ifndef OPENCV_DATASETS_TR_SVT_HPP +#define OPENCV_DATASETS_TR_SVT_HPP #include #include -#include "opencv2/datasetstools/dataset.hpp" +#include "opencv2/datasets/dataset.hpp" #include namespace cv { -namespace datasetstools +namespace datasets { struct tag diff --git a/modules/datasetstools/include/opencv2/datasetstools/util.hpp b/modules/datasets/include/opencv2/datasets/util.hpp similarity index 95% rename from modules/datasetstools/include/opencv2/datasetstools/util.hpp rename to modules/datasets/include/opencv2/datasets/util.hpp index 47816a47e..9d20fbab7 100644 --- a/modules/datasetstools/include/opencv2/datasetstools/util.hpp +++ b/modules/datasets/include/opencv2/datasets/util.hpp @@ -39,8 +39,8 @@ // //M*/ -#ifndef OPENCV_DATASETSTOOLS_UTIL_HPP -#define OPENCV_DATASETSTOOLS_UTIL_HPP +#ifndef OPENCV_DATASETS_UTIL_HPP +#define OPENCV_DATASETS_UTIL_HPP #include #include @@ -49,7 +49,7 @@ namespace cv { -namespace datasetstools +namespace datasets { void CV_EXPORTS split(const std::string &s, std::vector &elems, char delim); diff --git a/modules/datasetstools/samples/ar_hmdb.cpp b/modules/datasets/samples/ar_hmdb.cpp similarity index 97% rename from modules/datasetstools/samples/ar_hmdb.cpp rename to modules/datasets/samples/ar_hmdb.cpp index 5bb067f43..c4b2cd55c 100644 --- a/modules/datasetstools/samples/ar_hmdb.cpp +++ b/modules/datasets/samples/ar_hmdb.cpp @@ -39,7 +39,7 @@ // //M*/ -#include "opencv2/datasetstools/ar_hmdb.hpp" +#include "opencv2/datasets/ar_hmdb.hpp" #include @@ -50,7 +50,7 @@ using namespace std; using namespace cv; -using namespace cv::datasetstools; +using namespace cv::datasets; int main(int argc, char *argv[]) { diff --git a/modules/datasetstools/samples/ar_sports.cpp b/modules/datasets/samples/ar_sports.cpp similarity index 97% rename from modules/datasetstools/samples/ar_sports.cpp rename to modules/datasets/samples/ar_sports.cpp index d382ed0a5..df0d7c169 100644 --- a/modules/datasetstools/samples/ar_sports.cpp +++ b/modules/datasets/samples/ar_sports.cpp @@ -39,7 +39,7 @@ // //M*/ -#include "opencv2/datasetstools/ar_sports.hpp" +#include "opencv2/datasets/ar_sports.hpp" #include @@ -51,7 +51,7 @@ using namespace std; using namespace cv; -using namespace cv::datasetstools; +using namespace cv::datasets; int main(int argc, char *argv[]) { diff --git a/modules/datasetstools/samples/fr_lfw.cpp b/modules/datasets/samples/fr_lfw.cpp similarity index 97% rename from modules/datasetstools/samples/fr_lfw.cpp rename to modules/datasets/samples/fr_lfw.cpp index 348c69666..309ef2f0b 100644 --- a/modules/datasetstools/samples/fr_lfw.cpp +++ b/modules/datasets/samples/fr_lfw.cpp @@ -39,7 +39,7 @@ // //M*/ -#include "opencv2/datasetstools/fr_lfw.hpp" +#include "opencv2/datasets/fr_lfw.hpp" #include @@ -50,7 +50,7 @@ using namespace std; using namespace cv; -using namespace cv::datasetstools; +using namespace cv::datasets; int main(int argc, char *argv[]) { diff --git a/modules/datasetstools/samples/fr_lfw_benchmark.cpp b/modules/datasets/samples/fr_lfw_benchmark.cpp similarity index 95% rename from modules/datasetstools/samples/fr_lfw_benchmark.cpp rename to modules/datasets/samples/fr_lfw_benchmark.cpp index 00f1d9fc6..9f578b54a 100644 --- a/modules/datasetstools/samples/fr_lfw_benchmark.cpp +++ b/modules/datasets/samples/fr_lfw_benchmark.cpp @@ -43,7 +43,7 @@ #include "opencv2/imgcodecs.hpp" #include "opencv2/face.hpp" -#include "opencv2/datasetstools/fr_lfw.hpp" +#include "opencv2/datasets/fr_lfw.hpp" #include @@ -55,7 +55,7 @@ using namespace std; using namespace cv; -using namespace cv::datasetstools; +using namespace cv::datasets; using namespace cv::face; map people; @@ -68,7 +68,7 @@ int getLabel(const string &imagePath) map::iterator it = people.find(curr); if (people.end() == it) { - people.insert(make_pair(curr, people.size())); + people.insert(make_pair(curr, (int)people.size())); it = people.find(curr); } return (*it).second; @@ -115,11 +115,11 @@ int main(int argc, const char *argv[]) labels.push_back(currNum); } - // 2200 pairsDevTrain, first split: correct: 373, from: 600 -> 0.621667% + // 2200 pairsDevTrain, first split: correct: 373, from: 600 -> 62.1667% Ptr model = createLBPHFaceRecognizer(); - // 2200 pairsDevTrain, first split: correct: correct: 369, from: 600 -> 0.615% + // 2200 pairsDevTrain, first split: correct: correct: 369, from: 600 -> 61.5% //Ptr model = createEigenFaceRecognizer(); - // 2200 pairsDevTrain, first split: correct: 372, from: 600 -> 0.62% + // 2200 pairsDevTrain, first split: correct: 372, from: 600 -> 62% //Ptr model = createFisherFaceRecognizer(); model->train(images, labels); @@ -154,7 +154,7 @@ int main(int argc, const char *argv[]) } } p.push_back(1.0*correct/(correct+incorrect)); - printf("correct: %u, from: %u -> %f%%\n", correct, correct+incorrect, p.back()); + printf("correct: %u, from: %u -> %f\n", correct, correct+incorrect, p.back()); } double mu = 0.0; for (vector::iterator it=p.begin(); it!=p.end(); ++it) diff --git a/modules/datasetstools/samples/gr_chalearn.cpp b/modules/datasets/samples/gr_chalearn.cpp similarity index 98% rename from modules/datasetstools/samples/gr_chalearn.cpp rename to modules/datasets/samples/gr_chalearn.cpp index fa972667e..a16cd036c 100644 --- a/modules/datasetstools/samples/gr_chalearn.cpp +++ b/modules/datasets/samples/gr_chalearn.cpp @@ -39,7 +39,7 @@ // //M*/ -#include "opencv2/datasetstools/gr_chalearn.hpp" +#include "opencv2/datasets/gr_chalearn.hpp" #include @@ -50,7 +50,7 @@ using namespace std; using namespace cv; -using namespace cv::datasetstools; +using namespace cv::datasets; int main(int argc, char *argv[]) { diff --git a/modules/datasetstools/samples/gr_skig.cpp b/modules/datasets/samples/gr_skig.cpp similarity index 97% rename from modules/datasetstools/samples/gr_skig.cpp rename to modules/datasets/samples/gr_skig.cpp index 9eb099049..aa94c2ea5 100644 --- a/modules/datasetstools/samples/gr_skig.cpp +++ b/modules/datasets/samples/gr_skig.cpp @@ -39,7 +39,7 @@ // //M*/ -#include "opencv2/datasetstools/gr_skig.hpp" +#include "opencv2/datasets/gr_skig.hpp" #include @@ -51,7 +51,7 @@ using namespace std; using namespace cv; -using namespace cv::datasetstools; +using namespace cv::datasets; int main(int argc, char *argv[]) { diff --git a/modules/datasetstools/samples/hpe_parse.cpp b/modules/datasets/samples/hpe_parse.cpp similarity index 97% rename from modules/datasetstools/samples/hpe_parse.cpp rename to modules/datasets/samples/hpe_parse.cpp index b99ee189e..c3c1b43db 100644 --- a/modules/datasetstools/samples/hpe_parse.cpp +++ b/modules/datasets/samples/hpe_parse.cpp @@ -39,7 +39,7 @@ // //M*/ -#include "opencv2/datasetstools/hpe_parse.hpp" +#include "opencv2/datasets/hpe_parse.hpp" #include @@ -50,7 +50,7 @@ using namespace std; using namespace cv; -using namespace cv::datasetstools; +using namespace cv::datasets; int main(int argc, char *argv[]) { diff --git a/modules/datasetstools/samples/ir_affine.cpp b/modules/datasets/samples/ir_affine.cpp similarity index 97% rename from modules/datasetstools/samples/ir_affine.cpp rename to modules/datasets/samples/ir_affine.cpp index 06bc2f227..ce57afada 100644 --- a/modules/datasetstools/samples/ir_affine.cpp +++ b/modules/datasets/samples/ir_affine.cpp @@ -39,7 +39,7 @@ // //M*/ -#include "opencv2/datasetstools/ir_affine.hpp" +#include "opencv2/datasets/ir_affine.hpp" #include @@ -51,7 +51,7 @@ using namespace std; using namespace cv; -using namespace cv::datasetstools; +using namespace cv::datasets; int main(int argc, char *argv[]) { diff --git a/modules/datasetstools/samples/ir_robot.cpp b/modules/datasets/samples/ir_robot.cpp similarity index 97% rename from modules/datasetstools/samples/ir_robot.cpp rename to modules/datasets/samples/ir_robot.cpp index b06eb327b..1336e1286 100644 --- a/modules/datasetstools/samples/ir_robot.cpp +++ b/modules/datasets/samples/ir_robot.cpp @@ -39,7 +39,7 @@ // //M*/ -#include "opencv2/datasetstools/ir_robot.hpp" +#include "opencv2/datasets/ir_robot.hpp" #include @@ -50,7 +50,7 @@ using namespace std; using namespace cv; -using namespace cv::datasetstools; +using namespace cv::datasets; int main(int argc, char *argv[]) { diff --git a/modules/datasetstools/samples/is_bsds.cpp b/modules/datasets/samples/is_bsds.cpp similarity index 97% rename from modules/datasetstools/samples/is_bsds.cpp rename to modules/datasets/samples/is_bsds.cpp index 4c27954a5..3cec91d65 100644 --- a/modules/datasetstools/samples/is_bsds.cpp +++ b/modules/datasets/samples/is_bsds.cpp @@ -39,7 +39,7 @@ // //M*/ -#include "opencv2/datasetstools/is_bsds.hpp" +#include "opencv2/datasets/is_bsds.hpp" #include @@ -50,7 +50,7 @@ using namespace std; using namespace cv; -using namespace cv::datasetstools; +using namespace cv::datasets; int main(int argc, char *argv[]) { diff --git a/modules/datasetstools/samples/is_weizmann.cpp b/modules/datasets/samples/is_weizmann.cpp similarity index 97% rename from modules/datasetstools/samples/is_weizmann.cpp rename to modules/datasets/samples/is_weizmann.cpp index 6ee152fa1..c9d06e4bd 100644 --- a/modules/datasetstools/samples/is_weizmann.cpp +++ b/modules/datasets/samples/is_weizmann.cpp @@ -39,7 +39,7 @@ // //M*/ -#include "opencv2/datasetstools/is_weizmann.hpp" +#include "opencv2/datasets/is_weizmann.hpp" #include @@ -50,7 +50,7 @@ using namespace std; using namespace cv; -using namespace cv::datasetstools; +using namespace cv::datasets; int main(int argc, char *argv[]) { diff --git a/modules/datasetstools/samples/msm_epfl.cpp b/modules/datasets/samples/msm_epfl.cpp similarity index 98% rename from modules/datasetstools/samples/msm_epfl.cpp rename to modules/datasets/samples/msm_epfl.cpp index f80f340b5..ffe5f3869 100644 --- a/modules/datasetstools/samples/msm_epfl.cpp +++ b/modules/datasets/samples/msm_epfl.cpp @@ -39,7 +39,7 @@ // //M*/ -#include "opencv2/datasetstools/msm_epfl.hpp" +#include "opencv2/datasets/msm_epfl.hpp" #include @@ -50,7 +50,7 @@ using namespace std; using namespace cv; -using namespace cv::datasetstools; +using namespace cv::datasets; int main(int argc, char *argv[]) { diff --git a/modules/datasetstools/samples/msm_middlebury.cpp b/modules/datasets/samples/msm_middlebury.cpp similarity index 97% rename from modules/datasetstools/samples/msm_middlebury.cpp rename to modules/datasets/samples/msm_middlebury.cpp index 20f030e06..020b53d25 100644 --- a/modules/datasetstools/samples/msm_middlebury.cpp +++ b/modules/datasets/samples/msm_middlebury.cpp @@ -39,7 +39,7 @@ // //M*/ -#include "opencv2/datasetstools/msm_middlebury.hpp" +#include "opencv2/datasets/msm_middlebury.hpp" #include @@ -50,7 +50,7 @@ using namespace std; using namespace cv; -using namespace cv::datasetstools; +using namespace cv::datasets; int main(int argc, char *argv[]) { diff --git a/modules/datasetstools/samples/or_imagenet.cpp b/modules/datasets/samples/or_imagenet.cpp similarity index 97% rename from modules/datasetstools/samples/or_imagenet.cpp rename to modules/datasets/samples/or_imagenet.cpp index 99f13123b..13b9d8b01 100644 --- a/modules/datasetstools/samples/or_imagenet.cpp +++ b/modules/datasets/samples/or_imagenet.cpp @@ -39,7 +39,7 @@ // //M*/ -#include "opencv2/datasetstools/or_imagenet.hpp" +#include "opencv2/datasets/or_imagenet.hpp" #include @@ -52,7 +52,7 @@ using namespace std; using namespace cv; -using namespace cv::datasetstools; +using namespace cv::datasets; int main(int argc, char *argv[]) { diff --git a/modules/datasetstools/samples/or_mnist.cpp b/modules/datasets/samples/or_mnist.cpp similarity index 97% rename from modules/datasetstools/samples/or_mnist.cpp rename to modules/datasets/samples/or_mnist.cpp index 08d82004f..7ef56ae4b 100644 --- a/modules/datasetstools/samples/or_mnist.cpp +++ b/modules/datasets/samples/or_mnist.cpp @@ -39,7 +39,7 @@ // //M*/ -#include "opencv2/datasetstools/or_mnist.hpp" +#include "opencv2/datasets/or_mnist.hpp" #include #include @@ -51,7 +51,7 @@ using namespace std; using namespace cv; -using namespace cv::datasetstools; +using namespace cv::datasets; int main(int argc, char *argv[]) { diff --git a/modules/datasetstools/samples/or_sun.cpp b/modules/datasets/samples/or_sun.cpp similarity index 97% rename from modules/datasetstools/samples/or_sun.cpp rename to modules/datasets/samples/or_sun.cpp index 0804d8936..047b9796a 100644 --- a/modules/datasetstools/samples/or_sun.cpp +++ b/modules/datasets/samples/or_sun.cpp @@ -39,7 +39,7 @@ // //M*/ -#include "opencv2/datasetstools/or_sun.hpp" +#include "opencv2/datasets/or_sun.hpp" #include @@ -50,7 +50,7 @@ using namespace std; using namespace cv; -using namespace cv::datasetstools; +using namespace cv::datasets; int main(int argc, char *argv[]) { diff --git a/modules/datasetstools/samples/slam_kitti.cpp b/modules/datasets/samples/slam_kitti.cpp similarity index 98% rename from modules/datasetstools/samples/slam_kitti.cpp rename to modules/datasets/samples/slam_kitti.cpp index c2112208e..76ceb5983 100644 --- a/modules/datasetstools/samples/slam_kitti.cpp +++ b/modules/datasets/samples/slam_kitti.cpp @@ -39,7 +39,7 @@ // //M*/ -#include "opencv2/datasetstools/slam_kitti.hpp" +#include "opencv2/datasets/slam_kitti.hpp" #include @@ -50,7 +50,7 @@ using namespace std; using namespace cv; -using namespace cv::datasetstools; +using namespace cv::datasets; int main(int argc, char *argv[]) { diff --git a/modules/datasetstools/samples/slam_tumindoor.cpp b/modules/datasets/samples/slam_tumindoor.cpp similarity index 97% rename from modules/datasetstools/samples/slam_tumindoor.cpp rename to modules/datasets/samples/slam_tumindoor.cpp index 2ba504b66..3f78c119b 100644 --- a/modules/datasetstools/samples/slam_tumindoor.cpp +++ b/modules/datasets/samples/slam_tumindoor.cpp @@ -39,7 +39,7 @@ // //M*/ -#include "opencv2/datasetstools/slam_tumindoor.hpp" +#include "opencv2/datasets/slam_tumindoor.hpp" #include @@ -50,7 +50,7 @@ using namespace std; using namespace cv; -using namespace cv::datasetstools; +using namespace cv::datasets; int main(int argc, char *argv[]) { diff --git a/modules/datasetstools/samples/tr_chars.cpp b/modules/datasets/samples/tr_chars.cpp similarity index 98% rename from modules/datasetstools/samples/tr_chars.cpp rename to modules/datasets/samples/tr_chars.cpp index 0dd28d6f7..6d8c15741 100644 --- a/modules/datasetstools/samples/tr_chars.cpp +++ b/modules/datasets/samples/tr_chars.cpp @@ -39,7 +39,7 @@ // //M*/ -#include "opencv2/datasetstools/tr_chars.hpp" +#include "opencv2/datasets/tr_chars.hpp" #include @@ -51,7 +51,7 @@ using namespace std; using namespace cv; -using namespace cv::datasetstools; +using namespace cv::datasets; int main(int argc, char *argv[]) { diff --git a/modules/datasetstools/samples/tr_svt.cpp b/modules/datasets/samples/tr_svt.cpp similarity index 97% rename from modules/datasetstools/samples/tr_svt.cpp rename to modules/datasets/samples/tr_svt.cpp index 9dc05303e..495e8b03e 100644 --- a/modules/datasetstools/samples/tr_svt.cpp +++ b/modules/datasets/samples/tr_svt.cpp @@ -39,7 +39,7 @@ // //M*/ -#include "opencv2/datasetstools/tr_svt.hpp" +#include "opencv2/datasets/tr_svt.hpp" #include @@ -51,7 +51,7 @@ using namespace std; using namespace cv; -using namespace cv::datasetstools; +using namespace cv::datasets; int main(int argc, char *argv[]) { diff --git a/modules/datasetstools/src/ar_hmdb.cpp b/modules/datasets/src/ar_hmdb.cpp similarity index 98% rename from modules/datasetstools/src/ar_hmdb.cpp rename to modules/datasets/src/ar_hmdb.cpp index d30d48507..876857ee1 100644 --- a/modules/datasetstools/src/ar_hmdb.cpp +++ b/modules/datasets/src/ar_hmdb.cpp @@ -39,12 +39,12 @@ // //M*/ -#include "opencv2/datasetstools/ar_hmdb.hpp" +#include "opencv2/datasets/ar_hmdb.hpp" #include "precomp.hpp" namespace cv { -namespace datasetstools +namespace datasets { using namespace std; diff --git a/modules/datasetstools/src/ar_sports.cpp b/modules/datasets/src/ar_sports.cpp similarity index 98% rename from modules/datasetstools/src/ar_sports.cpp rename to modules/datasets/src/ar_sports.cpp index 0f4b4cf58..3af1ffd72 100644 --- a/modules/datasetstools/src/ar_sports.cpp +++ b/modules/datasets/src/ar_sports.cpp @@ -39,12 +39,12 @@ // //M*/ -#include "opencv2/datasetstools/ar_sports.hpp" +#include "opencv2/datasets/ar_sports.hpp" #include "precomp.hpp" namespace cv { -namespace datasetstools +namespace datasets { using namespace std; diff --git a/modules/datasetstools/src/dataset.cpp b/modules/datasets/src/dataset.cpp similarity index 97% rename from modules/datasetstools/src/dataset.cpp rename to modules/datasets/src/dataset.cpp index 9473f2aa3..083e870ca 100644 --- a/modules/datasetstools/src/dataset.cpp +++ b/modules/datasets/src/dataset.cpp @@ -39,12 +39,12 @@ // //M*/ -#include "opencv2/datasetstools/dataset.hpp" +#include "opencv2/datasets/dataset.hpp" #include "precomp.hpp" namespace cv { -namespace datasetstools +namespace datasets { using namespace std; diff --git a/modules/datasetstools/src/fr_lfw.cpp b/modules/datasets/src/fr_lfw.cpp similarity index 98% rename from modules/datasetstools/src/fr_lfw.cpp rename to modules/datasets/src/fr_lfw.cpp index ed648b7d4..57f1ce415 100644 --- a/modules/datasetstools/src/fr_lfw.cpp +++ b/modules/datasets/src/fr_lfw.cpp @@ -39,14 +39,14 @@ // //M*/ -#include "opencv2/datasetstools/fr_lfw.hpp" +#include "opencv2/datasets/fr_lfw.hpp" #include "precomp.hpp" #include namespace cv { -namespace datasetstools +namespace datasets { using namespace std; diff --git a/modules/datasetstools/src/gr_chalearn.cpp b/modules/datasets/src/gr_chalearn.cpp similarity index 98% rename from modules/datasetstools/src/gr_chalearn.cpp rename to modules/datasets/src/gr_chalearn.cpp index b9380193b..0f9e5ca6a 100644 --- a/modules/datasetstools/src/gr_chalearn.cpp +++ b/modules/datasets/src/gr_chalearn.cpp @@ -39,12 +39,12 @@ // //M*/ -#include "opencv2/datasetstools/gr_chalearn.hpp" +#include "opencv2/datasets/gr_chalearn.hpp" #include "precomp.hpp" namespace cv { -namespace datasetstools +namespace datasets { using namespace std; diff --git a/modules/datasetstools/src/gr_skig.cpp b/modules/datasets/src/gr_skig.cpp similarity index 98% rename from modules/datasetstools/src/gr_skig.cpp rename to modules/datasets/src/gr_skig.cpp index fe783fd37..3bff0d322 100644 --- a/modules/datasetstools/src/gr_skig.cpp +++ b/modules/datasets/src/gr_skig.cpp @@ -39,14 +39,14 @@ // //M*/ -#include "opencv2/datasetstools/gr_skig.hpp" +#include "opencv2/datasets/gr_skig.hpp" #include "precomp.hpp" #include namespace cv { -namespace datasetstools +namespace datasets { using namespace std; diff --git a/modules/datasetstools/src/hpe_parse.cpp b/modules/datasets/src/hpe_parse.cpp similarity index 98% rename from modules/datasetstools/src/hpe_parse.cpp rename to modules/datasets/src/hpe_parse.cpp index ea835fdc1..0a909beb7 100644 --- a/modules/datasetstools/src/hpe_parse.cpp +++ b/modules/datasets/src/hpe_parse.cpp @@ -39,12 +39,12 @@ // //M*/ -#include "opencv2/datasetstools/hpe_parse.hpp" +#include "opencv2/datasets/hpe_parse.hpp" #include "precomp.hpp" namespace cv { -namespace datasetstools +namespace datasets { using namespace std; diff --git a/modules/datasetstools/src/ir_affine.cpp b/modules/datasets/src/ir_affine.cpp similarity index 98% rename from modules/datasetstools/src/ir_affine.cpp rename to modules/datasets/src/ir_affine.cpp index 3373ecd15..e7a9e8922 100644 --- a/modules/datasetstools/src/ir_affine.cpp +++ b/modules/datasets/src/ir_affine.cpp @@ -39,12 +39,12 @@ // //M*/ -#include "opencv2/datasetstools/ir_affine.hpp" +#include "opencv2/datasets/ir_affine.hpp" #include "precomp.hpp" namespace cv { -namespace datasetstools +namespace datasets { using namespace std; diff --git a/modules/datasetstools/src/ir_robot.cpp b/modules/datasets/src/ir_robot.cpp similarity index 98% rename from modules/datasetstools/src/ir_robot.cpp rename to modules/datasets/src/ir_robot.cpp index e9c0678f5..145177d02 100644 --- a/modules/datasetstools/src/ir_robot.cpp +++ b/modules/datasets/src/ir_robot.cpp @@ -39,12 +39,12 @@ // //M*/ -#include "opencv2/datasetstools/ir_robot.hpp" +#include "opencv2/datasets/ir_robot.hpp" #include "precomp.hpp" namespace cv { -namespace datasetstools +namespace datasets { using namespace std; diff --git a/modules/datasetstools/src/is_bsds.cpp b/modules/datasets/src/is_bsds.cpp similarity index 98% rename from modules/datasetstools/src/is_bsds.cpp rename to modules/datasets/src/is_bsds.cpp index ebc397e30..c098de8c0 100644 --- a/modules/datasetstools/src/is_bsds.cpp +++ b/modules/datasets/src/is_bsds.cpp @@ -39,12 +39,12 @@ // //M*/ -#include "opencv2/datasetstools/is_bsds.hpp" +#include "opencv2/datasets/is_bsds.hpp" #include "precomp.hpp" namespace cv { -namespace datasetstools +namespace datasets { using namespace std; diff --git a/modules/datasetstools/src/is_weizmann.cpp b/modules/datasets/src/is_weizmann.cpp similarity index 97% rename from modules/datasetstools/src/is_weizmann.cpp rename to modules/datasets/src/is_weizmann.cpp index 094521080..ad4c03671 100644 --- a/modules/datasetstools/src/is_weizmann.cpp +++ b/modules/datasets/src/is_weizmann.cpp @@ -39,12 +39,12 @@ // //M*/ -#include "opencv2/datasetstools/is_weizmann.hpp" +#include "opencv2/datasets/is_weizmann.hpp" #include "precomp.hpp" namespace cv { -namespace datasetstools +namespace datasets { using namespace std; diff --git a/modules/datasetstools/src/msm_epfl.cpp b/modules/datasets/src/msm_epfl.cpp similarity index 98% rename from modules/datasetstools/src/msm_epfl.cpp rename to modules/datasets/src/msm_epfl.cpp index 220691e0c..d2802035f 100644 --- a/modules/datasetstools/src/msm_epfl.cpp +++ b/modules/datasets/src/msm_epfl.cpp @@ -39,12 +39,12 @@ // //M*/ -#include "opencv2/datasetstools/msm_epfl.hpp" +#include "opencv2/datasets/msm_epfl.hpp" #include "precomp.hpp" namespace cv { -namespace datasetstools +namespace datasets { using namespace std; diff --git a/modules/datasetstools/src/msm_middlebury.cpp b/modules/datasets/src/msm_middlebury.cpp similarity index 98% rename from modules/datasetstools/src/msm_middlebury.cpp rename to modules/datasets/src/msm_middlebury.cpp index e65b1330f..5780b4743 100644 --- a/modules/datasetstools/src/msm_middlebury.cpp +++ b/modules/datasets/src/msm_middlebury.cpp @@ -39,12 +39,12 @@ // //M*/ -#include "opencv2/datasetstools/msm_middlebury.hpp" +#include "opencv2/datasets/msm_middlebury.hpp" #include "precomp.hpp" namespace cv { -namespace datasetstools +namespace datasets { using namespace std; diff --git a/modules/datasetstools/src/or_imagenet.cpp b/modules/datasets/src/or_imagenet.cpp similarity index 97% rename from modules/datasetstools/src/or_imagenet.cpp rename to modules/datasets/src/or_imagenet.cpp index dc5986a4d..f6160549c 100644 --- a/modules/datasetstools/src/or_imagenet.cpp +++ b/modules/datasets/src/or_imagenet.cpp @@ -39,12 +39,12 @@ // //M*/ -#include "opencv2/datasetstools/or_imagenet.hpp" +#include "opencv2/datasets/or_imagenet.hpp" #include "precomp.hpp" namespace cv { -namespace datasetstools +namespace datasets { using namespace std; diff --git a/modules/datasetstools/src/or_mnist.cpp b/modules/datasets/src/or_mnist.cpp similarity index 98% rename from modules/datasetstools/src/or_mnist.cpp rename to modules/datasets/src/or_mnist.cpp index 5fe312213..ed069045e 100644 --- a/modules/datasetstools/src/or_mnist.cpp +++ b/modules/datasets/src/or_mnist.cpp @@ -39,12 +39,12 @@ // //M*/ -#include "opencv2/datasetstools/or_mnist.hpp" +#include "opencv2/datasets/or_mnist.hpp" #include "precomp.hpp" namespace cv { -namespace datasetstools +namespace datasets { using namespace std; diff --git a/modules/datasetstools/src/or_sun.cpp b/modules/datasets/src/or_sun.cpp similarity index 98% rename from modules/datasetstools/src/or_sun.cpp rename to modules/datasets/src/or_sun.cpp index 3a3492da5..5ae64cc8f 100644 --- a/modules/datasetstools/src/or_sun.cpp +++ b/modules/datasets/src/or_sun.cpp @@ -39,12 +39,12 @@ // //M*/ -#include "opencv2/datasetstools/or_sun.hpp" +#include "opencv2/datasets/or_sun.hpp" #include "precomp.hpp" namespace cv { -namespace datasetstools +namespace datasets { using namespace std; diff --git a/modules/datasetstools/src/precomp.hpp b/modules/datasets/src/precomp.hpp similarity index 98% rename from modules/datasetstools/src/precomp.hpp rename to modules/datasets/src/precomp.hpp index 55af6624c..bb048b7d2 100644 --- a/modules/datasetstools/src/precomp.hpp +++ b/modules/datasets/src/precomp.hpp @@ -47,6 +47,6 @@ #include -#include "opencv2/datasetstools/util.hpp" +#include "opencv2/datasets/util.hpp" #endif diff --git a/modules/datasetstools/src/slam_kitti.cpp b/modules/datasets/src/slam_kitti.cpp similarity index 98% rename from modules/datasetstools/src/slam_kitti.cpp rename to modules/datasets/src/slam_kitti.cpp index 697889fd3..0fcffbbce 100644 --- a/modules/datasetstools/src/slam_kitti.cpp +++ b/modules/datasets/src/slam_kitti.cpp @@ -39,12 +39,12 @@ // //M*/ -#include "opencv2/datasetstools/slam_kitti.hpp" +#include "opencv2/datasets/slam_kitti.hpp" #include "precomp.hpp" namespace cv { -namespace datasetstools +namespace datasets { using namespace std; diff --git a/modules/datasetstools/src/slam_tumindoor.cpp b/modules/datasets/src/slam_tumindoor.cpp similarity index 98% rename from modules/datasetstools/src/slam_tumindoor.cpp rename to modules/datasets/src/slam_tumindoor.cpp index 27712ebae..2c136382e 100644 --- a/modules/datasetstools/src/slam_tumindoor.cpp +++ b/modules/datasets/src/slam_tumindoor.cpp @@ -39,14 +39,14 @@ // //M*/ -#include "opencv2/datasetstools/slam_tumindoor.hpp" +#include "opencv2/datasets/slam_tumindoor.hpp" #include "precomp.hpp" #include namespace cv { -namespace datasetstools +namespace datasets { using namespace std; diff --git a/modules/datasetstools/src/tinyxml2/tinyxml2.cpp b/modules/datasets/src/tinyxml2/tinyxml2.cpp similarity index 99% rename from modules/datasetstools/src/tinyxml2/tinyxml2.cpp rename to modules/datasets/src/tinyxml2/tinyxml2.cpp index d88e48d15..815196995 100755 --- a/modules/datasetstools/src/tinyxml2/tinyxml2.cpp +++ b/modules/datasets/src/tinyxml2/tinyxml2.cpp @@ -21,7 +21,7 @@ must not be misrepresented as being the original software. distribution. */ -#include "opencv2/datasetstools/tinyxml2/tinyxml2.h" +#include "opencv2/datasets/tinyxml2/tinyxml2.h" #include // yes, this one new style header, is in the Android SDK. # ifdef ANDROID_NDK diff --git a/modules/datasetstools/src/tr_chars.cpp b/modules/datasets/src/tr_chars.cpp similarity index 98% rename from modules/datasetstools/src/tr_chars.cpp rename to modules/datasets/src/tr_chars.cpp index 0760f0f78..e83b8fa5b 100644 --- a/modules/datasetstools/src/tr_chars.cpp +++ b/modules/datasets/src/tr_chars.cpp @@ -39,12 +39,12 @@ // //M*/ -#include "opencv2/datasetstools/tr_chars.hpp" +#include "opencv2/datasets/tr_chars.hpp" #include "precomp.hpp" namespace cv { -namespace datasetstools +namespace datasets { using namespace std; diff --git a/modules/datasetstools/src/tr_svt.cpp b/modules/datasets/src/tr_svt.cpp similarity index 97% rename from modules/datasetstools/src/tr_svt.cpp rename to modules/datasets/src/tr_svt.cpp index 34d7fa908..05deaa3f0 100644 --- a/modules/datasetstools/src/tr_svt.cpp +++ b/modules/datasets/src/tr_svt.cpp @@ -39,14 +39,14 @@ // //M*/ -#include "opencv2/datasetstools/tr_svt.hpp" +#include "opencv2/datasets/tr_svt.hpp" #include "precomp.hpp" -#include +#include namespace cv { -namespace datasetstools +namespace datasets { using namespace std; diff --git a/modules/datasetstools/src/util.cpp b/modules/datasets/src/util.cpp similarity index 98% rename from modules/datasetstools/src/util.cpp rename to modules/datasets/src/util.cpp index 24bc342a4..adafb6ba4 100644 --- a/modules/datasetstools/src/util.cpp +++ b/modules/datasets/src/util.cpp @@ -39,7 +39,7 @@ // //M*/ -#include "opencv2/datasetstools/util.hpp" +#include "opencv2/datasets/util.hpp" #include @@ -55,7 +55,7 @@ namespace cv { -namespace datasetstools +namespace datasets { using namespace std; diff --git a/modules/datasetstools/CMakeLists.txt b/modules/datasetstools/CMakeLists.txt deleted file mode 100644 index 17285ee43..000000000 --- a/modules/datasetstools/CMakeLists.txt +++ /dev/null @@ -1,3 +0,0 @@ -set(the_description "datasets tools") -ocv_define_module(datasetstools opencv_core opencv_face) -