Merge pull request #2767 from vpisarev:3d_light

Author: vpisarev

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)