calib3d module in opencv is split into 3 modules: 3d, calib and stereo.

stereo module in opencv_contrib is renamed to xstereo

modules/aruco/CMakeLists.txt

@@ -1,2 +1,2 @@
 set(the_description "ArUco Marker Detection")
-ocv_define_module(aruco opencv_core opencv_imgproc opencv_calib3d WRAP python java objc)
+ocv_define_module(aruco opencv_core opencv_imgproc opencv_3d opencv_calib WRAP python java objc)

modules/aruco/samples/calibrate_camera.cpp

@@ -38,7 +38,8 @@ the use of this software, even if advised of the possibility of such damage.
 
 
 #include <opencv2/highgui.hpp>
-#include <opencv2/calib3d.hpp>
+#include <opencv2/3d.hpp>
+#include <opencv2/calib.hpp>
 #include <opencv2/aruco.hpp>
 #include <opencv2/imgproc.hpp>
 #include <vector>

modules/aruco/samples/calibrate_camera_charuco.cpp

@@ -38,7 +38,8 @@ the use of this software, even if advised of the possibility of such damage.
 
 
 #include <opencv2/highgui.hpp>
-#include <opencv2/calib3d.hpp>
+#include <opencv2/3d.hpp>
+#include <opencv2/calib.hpp>
 #include <opencv2/aruco/charuco.hpp>
 #include <opencv2/imgproc.hpp>
 #include <vector>

modules/aruco/src/aruco.cpp

@@ -40,6 +40,8 @@ the use of this software, even if advised of the possibility of such damage.
 #include "opencv2/aruco.hpp"
 #include <opencv2/core.hpp>
 #include <opencv2/imgproc.hpp>
+#include <opencv2/3d.hpp>
+#include <opencv2/calib.hpp>
 
 #include "apriltag_quad_thresh.hpp"
 #include "zarray.hpp"

modules/aruco/src/charuco.cpp

@@ -40,6 +40,7 @@ the use of this software, even if advised of the possibility of such damage.
 #include "opencv2/aruco/charuco.hpp"
 #include <opencv2/core.hpp>
 #include <opencv2/imgproc.hpp>
+#include <opencv2/calib.hpp>
 
 
 namespace cv {

modules/aruco/src/precomp.hpp

@@ -43,7 +43,7 @@
 #define __OPENCV_CCALIB_PRECOMP__
 
 #include <opencv2/core.hpp>
-#include <opencv2/calib3d.hpp>
+#include <opencv2/3d.hpp>
 #include <vector>
 
 #endif

modules/aruco/test/test_precomp.hpp

@@ -6,7 +6,7 @@
 
 #include "opencv2/ts.hpp"
 #include "opencv2/imgproc.hpp"
-#include "opencv2/calib3d.hpp"
+#include "opencv2/3d.hpp"
 #include "opencv2/aruco.hpp"
 #include <opencv2/aruco/charuco.hpp>
 

modules/bgsegm/CMakeLists.txt

@@ -1,2 +1,2 @@
 set(the_description "Background Segmentation Algorithms")
-ocv_define_module(bgsegm opencv_core opencv_imgproc opencv_video opencv_calib3d WRAP python java objc)
+ocv_define_module(bgsegm opencv_core opencv_imgproc opencv_video opencv_3d WRAP python java objc)

modules/bgsegm/src/bgfg_gsoc.cpp

@@ -50,7 +50,7 @@
 */
 
 #include "precomp.hpp"
-#include <opencv2/calib3d.hpp>
+#include <opencv2/3d.hpp>
 #include <iostream>
 #include "opencv2/core/cvdef.h"
 

modules/ccalib/CMakeLists.txt

@@ -1,2 +1,2 @@
 set(the_description "Custom Calibration Pattern")
-ocv_define_module(ccalib opencv_core opencv_imgproc opencv_calib3d opencv_features2d opencv_highgui WRAP python)
+ocv_define_module(ccalib opencv_core opencv_imgproc opencv_3d opencv_calib opencv_features2d opencv_highgui WRAP python)

modules/ccalib/include/opencv2/ccalib.hpp

@@ -45,7 +45,7 @@
 #include <opencv2/core.hpp>
 #include <opencv2/features2d.hpp>
 #include <opencv2/imgproc.hpp>
-#include <opencv2/calib3d.hpp>
+#include <opencv2/3d.hpp>
 
 #include <vector>
 

modules/ccalib/samples/omni_calibration.cpp

@@ -1,7 +1,8 @@
 #include "opencv2/ccalib/omnidir.hpp"
 #include "opencv2/core.hpp"
 #include "opencv2/imgproc.hpp"
-#include "opencv2/calib3d.hpp"
+#include "opencv2/3d.hpp"
+#include "opencv2/calib.hpp"
 #include "opencv2/highgui.hpp"
 #include <vector>
 #include <iostream>

modules/ccalib/samples/omni_stereo_calibration.cpp

@@ -2,7 +2,8 @@
 #include "opencv2/core.hpp"
 #include "opencv2/imgproc.hpp"
 #include "opencv2/highgui.hpp"
-#include "opencv2/calib3d.hpp"
+#include "opencv2/3d.hpp"
+#include "opencv2/calib.hpp"
 #include <vector>
 #include <iostream>
 #include <string>

modules/ccalib/samples/random_pattern_calibration.cpp

@@ -1,7 +1,8 @@
 #include "opencv2/ccalib/randpattern.hpp"
 #include "opencv2/highgui.hpp"
 #include "opencv2/imgproc.hpp"
-#include "opencv2/calib3d.hpp"
+#include "opencv2/3d.hpp"
+#include "opencv2/calib.hpp"
 #include <vector>
 #include <iostream>
 #include <time.h>

modules/ccalib/src/ccalib.cpp

@@ -49,7 +49,8 @@
 #include <opencv2/core.hpp>
 #include <opencv2/core/types_c.h> // CV_TERM
 #include <opencv2/imgproc.hpp>
-#include <opencv2/calib3d.hpp>
+#include <opencv2/3d.hpp>
+#include <opencv2/calib.hpp>
 #include <opencv2/features2d.hpp>
 
 #include <vector>

modules/ccalib/src/omnidir.cpp

@@ -58,6 +58,7 @@
  */
 #include "precomp.hpp"
 #include "opencv2/ccalib/omnidir.hpp"
+#include "opencv2/stereo.hpp"
 #include <fstream>
 #include <iostream>
 namespace cv { namespace

modules/ccalib/src/precomp.hpp

@@ -44,7 +44,8 @@
 #define __OPENCV_PRECOMP_H__
 
 #include <opencv2/core.hpp>
-#include <opencv2/calib3d.hpp>
+#include <opencv2/3d.hpp>
+#include <opencv2/calib.hpp>
 #include <opencv2/features2d.hpp>
 #include "opencv2/imgproc.hpp"
 #include "opencv2/highgui.hpp"

modules/ccalib/tutorials/omnidir_tutorial.markdown

@@ -17,7 +17,7 @@ This tutorial will introduce the following parts of omnidirectional camera calib
 -    calibrate a stereo pair of cameras.
 -    rectify images so that large distoration is removed.
 -    reconstruct 3D from two stereo images, with large filed of view.
--    comparison with fisheye model in opencv/calib3d/
+-    comparison with fisheye model in opencv/calib/
 
 Single Camera Calibration
 ---------------------

modules/cnn_3dobj/CMakeLists.txt

@@ -36,7 +36,7 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR})
 
 include_directories(${Caffe_INCLUDE_DIR})
 set(the_description "CNN for 3D object recognition and pose estimation including a completed Sphere View on 3D objects")
-ocv_define_module(cnn_3dobj opencv_core opencv_imgproc ${Caffe_LIBS} ${Glog_LIBS} ${Protobuf_LIBS} OPTIONAL opencv_features2d opencv_viz opencv_calib3d WRAP python)
+ocv_define_module(cnn_3dobj opencv_core opencv_imgproc ${Caffe_LIBS} ${Glog_LIBS} ${Protobuf_LIBS} OPTIONAL opencv_features2d opencv_viz opencv_3d WRAP python)
 ocv_add_testdata(testdata/cv contrib/cnn_3dobj)
 
 if(TARGET opencv_test_cnn_3dobj)

modules/cnn_3dobj/samples/video.cpp

@@ -1,5 +1,5 @@
 #include <opencv2/viz/vizcore.hpp>
-#include <opencv2/calib3d.hpp>
+#include <opencv2/3d.hpp>
 #include <iostream>
 #include <fstream>
 #include <opencv2/cnn_3dobj.hpp>

modules/cudalegacy/CMakeLists.txt

@@ -7,4 +7,4 @@ set(the_description "CUDA-accelerated Computer Vision (legacy)")
 ocv_warnings_disable(CMAKE_CXX_FLAGS /wd4127 /wd4130 /wd4324 /wd4512 /wd4310 -Wundef -Wmissing-declarations -Wuninitialized -Wshadow -Wdeprecated-declarations -Wstrict-aliasing -Wtautological-compare)
 
 ocv_define_module(cudalegacy opencv_core opencv_video
-  OPTIONAL opencv_objdetect opencv_imgproc opencv_calib3d opencv_cudaarithm opencv_cudafilters opencv_cudaimgproc)
+  OPTIONAL opencv_objdetect opencv_imgproc opencv_3d opencv_stereo opencv_calib opencv_cudaarithm opencv_cudafilters opencv_cudaimgproc)

modules/cudalegacy/perf/perf_calib3d.cpp

@@ -42,9 +42,9 @@
 
 #include "perf_precomp.hpp"
 
-#ifdef HAVE_OPENCV_CALIB3D
+#ifdef HAVE_OPENCV_3D
 
-#include "opencv2/calib3d.hpp"
+#include "opencv2/3d.hpp"
 
 namespace opencv_test { namespace {
 

modules/cudalegacy/src/calib3d.cpp

@@ -45,7 +45,7 @@
 using namespace cv;
 using namespace cv::cuda;
 
-#if !defined HAVE_CUDA || !defined HAVE_OPENCV_CALIB3D || defined(CUDA_DISABLER)
+#if !defined HAVE_CUDA || !defined HAVE_OPENCV_3D || defined(CUDA_DISABLER)
 
 void cv::cuda::transformPoints(const GpuMat&, const Mat&, const Mat&, GpuMat&, Stream&) { throw_no_cuda(); }
 

modules/cudalegacy/src/precomp.hpp

@@ -63,8 +63,8 @@
 #  include "opencv2/objdetect.hpp"
 #endif
 
-#ifdef HAVE_OPENCV_CALIB3D
-#  include "opencv2/calib3d.hpp"
+#ifdef HAVE_OPENCV_3D
+#  include "opencv2/3d.hpp"
 #endif
 
 #ifdef HAVE_OPENCV_CUDAARITHM

modules/cudalegacy/test/test_calib3d.cpp

@@ -42,9 +42,9 @@
 
 #include "test_precomp.hpp"
 
-#if defined HAVE_CUDA && defined HAVE_OPENCV_CALIB3D
+#if defined HAVE_CUDA && defined HAVE_OPENCV_3D
 
-#include "opencv2/calib3d.hpp"
+#include "opencv2/3d.hpp"
 
 namespace opencv_test { namespace {
 

modules/cudastereo/CMakeLists.txt

@@ -6,4 +6,4 @@ set(the_description "CUDA-accelerated Stereo Correspondence")
 
 ocv_warnings_disable(CMAKE_CXX_FLAGS /wd4127 /wd4324 /wd4512 -Wundef -Wmissing-declarations -Wshadow)
 
-ocv_define_module(cudastereo opencv_calib3d WRAP python)
+ocv_define_module(cudastereo opencv_3d opencv_stereo WRAP python)

modules/cudastereo/include/opencv2/cudastereo.hpp

@@ -48,7 +48,8 @@
 #endif
 
 #include "opencv2/core/cuda.hpp"
-#include "opencv2/calib3d.hpp"
+#include "opencv2/3d.hpp"
+#include "opencv2/stereo.hpp"
 
 /**
   @addtogroup cuda

modules/cudastereo/perf/perf_precomp.hpp

@@ -46,7 +46,8 @@
 #include "opencv2/ts/cuda_perf.hpp"
 
 #include "opencv2/cudastereo.hpp"
-#include "opencv2/calib3d.hpp"
+#include "opencv2/3d.hpp"
+#include "opencv2/stereo.hpp"
 
 namespace opencv_test {
 using namespace perf;

modules/cudastereo/test/test_precomp.hpp

@@ -46,7 +46,8 @@
 #include "opencv2/ts/cuda_test.hpp"
 
 #include "opencv2/cudastereo.hpp"
-#include "opencv2/calib3d.hpp"
+#include "opencv2/3d.hpp"
+#include "opencv2/stereo.hpp"
 
 #include "cvconfig.h"
 

modules/face/CMakeLists.txt

@@ -2,7 +2,7 @@ set(the_description "Face recognition etc")
 ocv_define_module(face opencv_core
     opencv_imgproc
     opencv_objdetect
-    opencv_calib3d   # estimateAffinePartial2D() (trainFacemark)
+    opencv_3d   # estimateAffinePartial2D() (trainFacemark)
     opencv_photo     # seamlessClone() (face_swap sample)
     WRAP python java objc
 )

modules/face/src/trainFacemark.cpp

@@ -4,7 +4,7 @@
 
 #include "precomp.hpp"
 #include "face_alignmentimpl.hpp"
-#include "opencv2/calib3d.hpp"
+#include "opencv2/3d.hpp"
 #include <climits>
 
 using namespace std;

modules/matlab/CMakeLists.txt

@@ -110,7 +110,7 @@ ocv_add_module(matlab   BINDINGS
                                  opencv_imgcodecs opencv_videoio opencv_highgui
                                  opencv_objdetect opencv_flann opencv_features2d
                                  opencv_photo opencv_video opencv_videostab
-                                 opencv_calib opencv_calib3d
+                                 opencv_calib opencv_3d
                                  opencv_stitching opencv_superres
                                  opencv_xfeatures2d
 )

modules/matlab/include/opencv2/matlab/bridge.hpp

@@ -51,7 +51,7 @@
 #include <string>
 #include <opencv2/core.hpp>
 #include <opencv2/imgproc.hpp>
-#include <opencv2/calib3d.hpp>
+#include <opencv2/3d.hpp>
 #include <opencv2/photo.hpp>
 #include <opencv2/stitching.hpp>
 #include <opencv2/video.hpp>

modules/mcc/src/precomp.hpp

@@ -33,7 +33,7 @@
 
 #include <opencv2/core.hpp>
 #include <opencv2/imgproc.hpp>
-#include <opencv2/calib3d.hpp>
+#include <opencv2/3d.hpp>
 #include <opencv2/dnn.hpp>
 
 #include <vector>

modules/optflow/CMakeLists.txt

@@ -1,2 +1,2 @@
 set(the_description "Optical Flow Algorithms")
-ocv_define_module(optflow opencv_core opencv_imgproc opencv_calib3d opencv_video opencv_ximgproc opencv_imgcodecs opencv_flann WRAP python)
+ocv_define_module(optflow opencv_core opencv_imgproc opencv_3d opencv_video opencv_ximgproc opencv_imgcodecs opencv_flann WRAP python)

modules/optflow/src/rlof/rlof_localflow.cpp

@@ -3,7 +3,7 @@
 // of this distribution and at http://opencv.org/license.html.
 #include "../precomp.hpp"
 
-#include "opencv2/calib3d.hpp"  // findHomography
+#include "opencv2/3d.hpp"  // findHomography
 #include "rlof_localflow.h"
 #include "berlof_invoker.hpp"
 #include "rlof_invoker.hpp"

modules/ovis/CMakeLists.txt

@@ -19,7 +19,7 @@ endif()
 include_directories(${OGRE_INCLUDE_DIRS})
 link_directories(${OGRE_LIBRARY_DIRS})
 
-ocv_add_module(ovis opencv_core opencv_imgproc opencv_calib3d WRAP python)
+ocv_add_module(ovis opencv_core opencv_imgproc opencv_3d WRAP python)
 ocv_glob_module_sources()
 ocv_module_include_directories()
 ocv_create_module()

modules/ovis/samples/aruco_ar_demo.cpp

@@ -1,5 +1,5 @@
 #include <opencv2/highgui.hpp>
-#include <opencv2/calib3d.hpp>
+#include <opencv2/3d.hpp>
 #include <opencv2/videoio.hpp>
 
 #include <opencv2/ovis.hpp>

modules/ovis/samples/ovis_demo.cpp

@@ -1,4 +1,4 @@
-#include <opencv2/calib3d.hpp>
+#include <opencv2/3d.hpp>
 #include <opencv2/videoio.hpp>
 
 #include <opencv2/ovis.hpp>

modules/ovis/src/ovis.cpp

@@ -9,7 +9,7 @@
 #include <OgreRectangle2D.h>
 #include <OgreCompositorManager.h>
 
-#include <opencv2/calib3d.hpp>
+#include <opencv2/3d.hpp>
 #include <opencv2/core/utils/configuration.private.hpp>
 
 

modules/rapid/CMakeLists.txt

@@ -1,2 +1,2 @@
 set(the_description "rapid - silhouette based 3D object tracking")
-ocv_define_module(rapid opencv_core opencv_imgproc opencv_calib3d WRAP python)
+ocv_define_module(rapid opencv_core opencv_imgproc opencv_3d WRAP python)

modules/rapid/src/precomp.hpp

@@ -6,7 +6,7 @@
 
 #include "opencv2/rapid.hpp"
 #include <vector>
-#include <opencv2/calib3d.hpp>
+#include <opencv2/3d.hpp>
 
 namespace cv
 {

modules/rapid/test/test_precomp.hpp

@@ -6,7 +6,7 @@
 
 #include "opencv2/ts.hpp"
 #include "opencv2/imgproc.hpp"
-#include "opencv2/calib3d.hpp"
+#include "opencv2/3d.hpp"
 #include "opencv2/rapid.hpp"
 
 #endif

modules/reg/samples/map_test.cpp

@@ -42,7 +42,7 @@
 
 #ifdef COMPARE_FEATURES
 #include <opencv2/xfeatures2d.hpp>
-#include <opencv2/calib3d.hpp>
+#include <opencv2/3d.hpp>
 #include <opencv2/calib3d/calib3d_c.h>
 using namespace cv::xfeatures2d;
 #endif

modules/rgbd/perf/perf_precomp.hpp

@@ -7,7 +7,7 @@
 
 #include <opencv2/ts.hpp>
 #include <opencv2/rgbd.hpp>
-#include <opencv2/calib3d.hpp>
+#include <opencv2/3d.hpp>
 
 #ifdef HAVE_OPENCL
 #include <opencv2/core/ocl.hpp>

modules/rgbd/samples/dynafu_demo.cpp

@@ -9,7 +9,7 @@
 #include <iostream>
 #include <fstream>
 #include <opencv2/imgproc.hpp>
-#include <opencv2/calib3d.hpp>
+#include <opencv2/3d.hpp>
 #include <opencv2/highgui.hpp>
 #include <opencv2/core/utils/logger.hpp>
 #include <opencv2/rgbd.hpp>

modules/rgbd/samples/kinfu_demo.cpp

@@ -7,7 +7,7 @@
 #include <iostream>
 #include <fstream>
 #include <opencv2/imgproc.hpp>
-#include <opencv2/calib3d.hpp>
+#include <opencv2/3d.hpp>
 #include <opencv2/highgui.hpp>
 #include <opencv2/rgbd/kinfu.hpp>
 

modules/rgbd/samples/odometry_evaluation.cpp

@@ -7,7 +7,7 @@
 #include <opencv2/rgbd.hpp>
 
 #include <opencv2/highgui.hpp>
-#include <opencv2/calib3d.hpp>
+#include <opencv2/3d.hpp>
 #include <opencv2/imgproc.hpp>
 #include <opencv2/core/utility.hpp>
 

modules/rgbd/src/precomp.hpp

@@ -20,7 +20,7 @@
 #include "opencv2/core/hal/intrin.hpp"
 #include "opencv2/core/ocl.hpp"
 #include "opencv2/imgproc.hpp"
-#include "opencv2/calib3d.hpp"
+#include "opencv2/3d.hpp"
 #include "opencv2/rgbd.hpp"
 
 #endif

modules/rgbd/test/test_normal.cpp

@@ -6,7 +6,7 @@
 
 #include "test_precomp.hpp"
 #include <opencv2/rgbd.hpp>
-#include <opencv2/calib3d.hpp>
+#include <opencv2/3d.hpp>
 
 namespace opencv_test { namespace {
 

modules/rgbd/test/test_precomp.hpp

@@ -11,7 +11,7 @@
 
 #include <opencv2/ts.hpp>
 #include <opencv2/rgbd.hpp>
-#include <opencv2/calib3d.hpp>
+#include <opencv2/3d.hpp>
 
 #ifdef HAVE_OPENCL
 #include <opencv2/core/ocl.hpp>

modules/sfm/CMakeLists.txt

@@ -102,7 +102,7 @@ endif()
 
 ocv_add_module(sfm
   opencv_core
-  opencv_calib3d
+  opencv_3d
   opencv_features2d
   opencv_xfeatures2d
   opencv_imgcodecs

modules/sfm/samples/match_reconstruct.cpp

@@ -1,6 +1,6 @@
 #include <opencv2/sfm.hpp>
 #include <opencv2/viz.hpp>
-#include <opencv2/calib3d.hpp>
+#include <opencv2/3d.hpp>
 #include <opencv2/core.hpp>
 
 #include <iostream>

modules/sfm/samples/scene_reconstruction.cpp

@@ -1,6 +1,6 @@
 #include <opencv2/sfm.hpp>
 #include <opencv2/viz.hpp>
-#include <opencv2/calib3d.hpp>
+#include <opencv2/3d.hpp>
 #include <opencv2/core.hpp>
 
 #include <iostream>

modules/sfm/test/scene.cpp

@@ -33,7 +33,7 @@
  *
  */
 
-#include <opencv2/calib3d.hpp>
+#include <opencv2/3d.hpp>
 #include <opencv2/core.hpp>
 
 #include "test_precomp.hpp"

modules/shape/CMakeLists.txt

@@ -1,2 +1,2 @@
 set(the_description "Shape descriptors and matchers")
-ocv_define_module(shape opencv_core opencv_imgproc opencv_calib3d WRAP python)
+ocv_define_module(shape opencv_core opencv_imgproc opencv_3d WRAP python)

modules/shape/src/precomp.hpp

@@ -47,7 +47,7 @@
 #include <cmath>
 #include <iostream>
 
-#include "opencv2/calib3d.hpp"
+#include "opencv2/3d.hpp"
 #include "opencv2/imgproc.hpp"
 #include "opencv2/shape.hpp"
 

modules/stereo/CMakeLists.txt

@@ -1,2 +0,0 @@
-set(the_description "Stereo Correspondence")
-ocv_define_module(stereo opencv_imgproc opencv_features2d opencv_core opencv_tracking)

modules/stereo/include/opencv2/stereo/stereo.hpp

@@ -1,49 +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) 2000-2008, Intel Corporation, all rights reserved.
-// Copyright (C) 2009, Willow Garage Inc., all rights reserved.
-// Copyright (C) 2013, OpenCV Foundation, 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 Intel Corporation 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*/
-
-#ifdef __OPENCV_BUILD
-#error this is a compatibility header which should not be used inside the OpenCV library
-#endif
-
-#include "opencv2/stereo.hpp"
-

modules/structured_light/CMakeLists.txt

@@ -1,2 +1,2 @@
 set(the_description "Structured Light API")
-ocv_define_module(structured_light opencv_core opencv_imgproc opencv_calib3d opencv_phase_unwrapping OPTIONAL opencv_viz WRAP python java objc)
+ocv_define_module(structured_light opencv_core opencv_imgproc opencv_3d opencv_stereo opencv_calib opencv_phase_unwrapping OPTIONAL opencv_viz WRAP python java objc)

modules/structured_light/include/opencv2/structured_light/sinusoidalpattern.hpp

@@ -46,7 +46,7 @@
 #include "opencv2/imgproc.hpp"
 #include "opencv2/structured_light/structured_light.hpp"
 #include <opencv2/phase_unwrapping.hpp>
-#include <opencv2/calib3d.hpp>
+#include <opencv2/3d.hpp>
 
 namespace cv {
 namespace structured_light {

modules/structured_light/samples/capsinpattern.cpp

@@ -46,7 +46,7 @@
 #include <opencv2/core.hpp>
 #include <opencv2/core/utility.hpp>
 #include <opencv2/imgproc.hpp>
-#include <opencv2/calib3d.hpp>
+#include <opencv2/3d.hpp>
 #include <opencv2/structured_light.hpp>
 #include <opencv2/phase_unwrapping.hpp>
 

modules/structured_light/samples/pointcloud.cpp

@@ -42,7 +42,8 @@
 #include <iostream>
 #include <opencv2/core.hpp>
 #include <opencv2/highgui.hpp>
-#include <opencv2/calib3d.hpp>
+#include <opencv2/3d.hpp>
+#include <opencv2/stereo.hpp>
 #include <opencv2/imgproc.hpp>
 #include <opencv2/structured_light.hpp>
 #include <opencv2/opencv_modules.hpp>

modules/structured_light/samples/projectorcalibration.cpp

@@ -47,7 +47,8 @@
 #include <opencv2/core.hpp>
 #include <opencv2/core/utility.hpp>
 #include <opencv2/imgproc.hpp>
-#include <opencv2/calib3d.hpp>
+#include <opencv2/3d.hpp>
+#include <opencv2/calib.hpp>
 
 using namespace std;
 using namespace cv;

modules/structured_light/test/test_plane.cpp

@@ -40,6 +40,7 @@
  //M*/
 
 #include "test_precomp.hpp"
+#include "opencv2/stereo.hpp"
 
 namespace opencv_test { namespace {
 

modules/videostab/CMakeLists.txt

@@ -8,5 +8,5 @@ if(DEFINED WINRT AND NOT DEFINED ENABLE_WINRT_MODE_NATIVE)
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /ZW")
 endif()
 
-ocv_define_module(videostab opencv_imgproc opencv_features2d opencv_video opencv_photo opencv_calib3d
+ocv_define_module(videostab opencv_imgproc opencv_features2d opencv_video opencv_photo opencv_3d
 OPTIONAL opencv_cudawarping opencv_cudaoptflow opencv_videoio WRAP python)

modules/videostab/src/precomp.hpp

@@ -51,7 +51,7 @@
 #include "opencv2/imgproc.hpp"
 #include "opencv2/video.hpp"
 #include "opencv2/features2d.hpp"
-#include "opencv2/calib3d.hpp"
+#include "opencv2/3d.hpp"
 
 #include "opencv2/core/private.hpp"
 

modules/viz/CMakeLists.txt

@@ -32,7 +32,7 @@ ocv_create_module()
 
 ocv_add_accuracy_tests()
 ocv_add_perf_tests()
-ocv_add_samples(opencv_imgproc opencv_calib3d opencv_features2d opencv_flann)
+ocv_add_samples(opencv_imgproc opencv_3d opencv_features2d opencv_flann)
 
 
 if (VTK_VERSION VERSION_LESS "8.90.0")

modules/viz/samples/widget_pose.cpp

@@ -5,7 +5,7 @@
  */
 
 #include <opencv2/viz.hpp>
-#include <opencv2/calib3d.hpp>
+#include <opencv2/3d.hpp>
 #include <iostream>
 
 using namespace cv;

modules/xfeatures2d/CMakeLists.txt

@@ -3,7 +3,7 @@ set(the_description "Contributed/Experimental Algorithms for Salient 2D Features
 if(HAVE_CUDA)
   ocv_warnings_disable(CMAKE_CXX_FLAGS -Wundef)
 endif()
-ocv_define_module(xfeatures2d opencv_core opencv_imgproc opencv_features2d opencv_calib3d OPTIONAL opencv_shape opencv_ml opencv_cudaarithm WRAP python java objc)
+ocv_define_module(xfeatures2d opencv_core opencv_imgproc opencv_features2d opencv_3d OPTIONAL opencv_shape opencv_ml opencv_cudaarithm WRAP python java objc)
 
 include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/download_vgg.cmake)
 include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/download_boostdesc.cmake)

modules/xfeatures2d/samples/surf_matcher.cpp

@@ -6,7 +6,7 @@
 #include "opencv2/imgcodecs.hpp"
 #include "opencv2/highgui.hpp"
 #include "opencv2/features2d.hpp"
-#include "opencv2/calib3d.hpp"
+#include "opencv2/3d.hpp"
 #include "opencv2/imgproc.hpp"
 #include "opencv2/xfeatures2d.hpp"
 

modules/xfeatures2d/samples/video_homography.cpp

@@ -8,9 +8,9 @@
 #include <iostream>
 #include "opencv2/opencv_modules.hpp"
 
-#ifdef HAVE_OPENCV_CALIB3D
+#ifdef HAVE_OPENCV_3D
 
-#include "opencv2/calib3d.hpp"
+#include "opencv2/3d.hpp"
 #include "opencv2/videoio.hpp"
 #include "opencv2/highgui.hpp"
 #include "opencv2/imgproc.hpp"
@@ -241,7 +241,7 @@ int main(int ac, char ** av)
 
 int main()
 {
-    std::cerr << "OpenCV was built without calib3d module" << std::endl;
+    std::cerr << "OpenCV was built without 3d module" << std::endl;
     return 0;
 }
 

modules/xfeatures2d/test/test_precomp.hpp

@@ -7,7 +7,7 @@
 #include "opencv2/ts.hpp"
 #include "opencv2/ts/cuda_test.hpp"
 #include "opencv2/xfeatures2d.hpp"
-#include "opencv2/calib3d.hpp"
+#include "opencv2/3d.hpp"
 
 #include "cvconfig.h"
 

modules/ximgproc/CMakeLists.txt

@@ -1,2 +1,2 @@
 set(the_description "Extended image processing module. It includes edge-aware filters and etc.")
-ocv_define_module(ximgproc opencv_core opencv_imgproc opencv_calib3d opencv_imgcodecs opencv_video WRAP python java objc)
+ocv_define_module(ximgproc opencv_core opencv_imgproc opencv_3d opencv_stereo opencv_imgcodecs opencv_video WRAP python java objc)

modules/ximgproc/include/opencv2/ximgproc/disparity_filter.hpp

@@ -39,7 +39,7 @@
 #ifdef __cplusplus
 
 #include <opencv2/core.hpp>
-#include <opencv2/calib3d.hpp>
+#include <opencv2/stereo.hpp>
 
 namespace cv {
 namespace ximgproc {

modules/ximgproc/samples/disparity_filtering.cpp

@@ -1,4 +1,4 @@
-#include "opencv2/calib3d.hpp"
+#include "opencv2/stereo.hpp"
 #include "opencv2/imgproc.hpp"
 #include "opencv2/imgcodecs.hpp"
 #include "opencv2/highgui.hpp"

modules/xstereo/CMakeLists.txt

@@ -0,0 +1,2 @@
+set(the_description "Stereo Correspondence")
+ocv_define_module(xstereo opencv_imgproc opencv_features2d opencv_core opencv_stereo opencv_tracking)

modules/xstereo/include/opencv2/xstereo.hpp

@@ -41,15 +41,16 @@
 //
 //M*/
 
-#ifndef __OPENCV_STEREO_HPP__
-#define __OPENCV_STEREO_HPP__
+#ifndef __OPENCV_XSTEREO_HPP__
+#define __OPENCV_XSTEREO_HPP__
 
 #include "opencv2/core.hpp"
-#include "opencv2/stereo/descriptor.hpp"
-#include <opencv2/stereo/quasi_dense_stereo.hpp>
+#include "opencv2/stereo.hpp"
+#include "opencv2/xstereo/descriptor.hpp"
+#include <opencv2/xstereo/quasi_dense_stereo.hpp>
 
 /**
-@defgroup stereo Stereo Correspondance Algorithms
+@defgroup xstereo Extra Stereo Correspondance Algorithms
 
 */
 
@@ -57,58 +58,6 @@ namespace cv
 {
     namespace stereo
     {
-        //! @addtogroup stereo
-        //! @{
-        /** @brief Filters off small noise blobs (speckles) in the disparity map
-        @param img The input 16-bit signed disparity image
-        @param newVal The disparity value used to paint-off the speckles
-        @param maxSpeckleSize The maximum speckle size to consider it a speckle. Larger blobs are not
-        affected by the algorithm
-        @param maxDiff Maximum difference between neighbor disparity pixels to put them into the same
-        blob. Note that since StereoBM, StereoSGBM and may be other algorithms return a fixed-point
-        disparity map, where disparity values are multiplied by 16, this scale factor should be taken into
-        account when specifying this parameter value.
-        @param buf The optional temporary buffer to avoid memory allocation within the function.
-        */
-        /** @brief The base class for stereo correspondence algorithms.
-        */
-        class StereoMatcher : public Algorithm
-        {
-        public:
-            enum { DISP_SHIFT = 4,
-                DISP_SCALE = (1 << DISP_SHIFT)
-            };
-
-            /** @brief Computes disparity map for the specified stereo pair
-
-            @param left Left 8-bit single-channel image.
-            @param right Right image of the same size and the same type as the left one.
-            @param disparity Output disparity map. It has the same size as the input images. Some algorithms,
-            like StereoBM or StereoSGBM compute 16-bit fixed-point disparity map (where each disparity value
-            has 4 fractional bits), whereas other algorithms output 32-bit floating-point disparity map.
-            */
-            virtual void compute( InputArray left, InputArray right,
-                OutputArray disparity ) = 0;
-
-            virtual int getMinDisparity() const = 0;
-            virtual void setMinDisparity(int minDisparity) = 0;
-
-            virtual int getNumDisparities() const = 0;
-            virtual void setNumDisparities(int numDisparities) = 0;
-
-            virtual int getBlockSize() const = 0;
-            virtual void setBlockSize(int blockSize) = 0;
-
-            virtual int getSpeckleWindowSize() const = 0;
-            virtual void setSpeckleWindowSize(int speckleWindowSize) = 0;
-
-            virtual int getSpeckleRange() const = 0;
-            virtual void setSpeckleRange(int speckleRange) = 0;
-
-            virtual int getDisp12MaxDiff() const = 0;
-            virtual void setDisp12MaxDiff(int disp12MaxDiff) = 0;
-
-        };
         //!speckle removal algorithms. These algorithms have the purpose of removing small regions
         enum {
             CV_SPECKLE_REMOVAL_ALGORITHM, CV_SPECKLE_REMOVAL_AVG_ALGORITHM
@@ -263,7 +212,7 @@ namespace cv
             set StereoSGBM::numDisparities at minimum. The second constructor enables you to set each parameter
             to a custom value.
             */
-            CV_EXPORTS static Ptr<cv::stereo::StereoBinarySGBM> create(int minDisparity, int numDisparities, int blockSize,
+            CV_EXPORTS static Ptr<StereoBinarySGBM> create(int minDisparity, int numDisparities, int blockSize,
                 int P1 = 100, int P2 = 1000, int disp12MaxDiff = 1,
                 int preFilterCap = 0, int uniquenessRatio = 5,
                 int speckleWindowSize = 400, int speckleRange = 200,

modules/xstereo/include/opencv2/xstereo/quasi_dense_stereo.hpp

@@ -18,7 +18,7 @@ namespace cv
 {
 namespace stereo
 {
-/** \addtogroup stereo
+/** \addtogroup xstereo
  *  @{
  */
 

modules/xstereo/perf/perf_precomp.hpp

@@ -5,7 +5,7 @@
 #define __OPENCV_PERF_PRECOMP_HPP__
 
 #include "opencv2/ts.hpp"
-#include "opencv2/stereo.hpp"
+#include "opencv2/xstereo.hpp"
 
 namespace opencv_test {
 using namespace cv::stereo;

modules/xstereo/samples/dense_disparity.cpp

@@ -1,7 +1,7 @@
 #include <opencv2/core.hpp>
 #include <opencv2/highgui.hpp>
 #include <fstream>
-#include <opencv2/stereo.hpp>
+#include <opencv2/xstereo.hpp>
 
 
 

modules/xstereo/samples/export_param_file.cpp

@@ -1,5 +1,5 @@
 #include <opencv2/core.hpp>
-#include <opencv2/stereo.hpp>
+#include <opencv2/xstereo.hpp>
 
 using namespace cv;
 using namespace std;

modules/xstereo/samples/sample.cpp

@@ -1,4 +1,4 @@
-#include "opencv2/stereo.hpp"
+#include "opencv2/xstereo.hpp"
 #include "opencv2/imgproc.hpp"
 #include "opencv2/highgui.hpp"
 #include <stdio.h>

modules/xstereo/src/precomp.hpp

@@ -44,10 +44,10 @@
 
 #include "opencv2/core.hpp"
 #include "opencv2/imgproc.hpp"
-#include "opencv2/calib3d.hpp"
-
 #include "opencv2/stereo.hpp"
 
+#include "opencv2/xstereo.hpp"
+
 #include "descriptor.hpp"
 #include "matching.hpp"
 

modules/xstereo/src/quasi_dense_stereo.cpp

@@ -4,7 +4,7 @@
 
 #include "precomp.hpp"
 #include <opencv2/video/tracking.hpp>
-#include <opencv2/stereo/quasi_dense_stereo.hpp>
+#include <opencv2/xstereo/quasi_dense_stereo.hpp>
 #include <queue>
 
 

modules/xstereo/test/test_precomp.hpp

@@ -5,7 +5,7 @@
 #define __OPENCV_TEST_PRECOMP_HPP__
 
 #include "opencv2/ts.hpp"
-#include "opencv2/stereo.hpp"
+#include "opencv2/xstereo.hpp"
 
 namespace opencv_test {
 using namespace cv::stereo;