Merge commit '43aec5ad' into merge-2.4

Conflicts:
	cmake/OpenCVConfig.cmake
	cmake/OpenCVLegacyOptions.cmake
	modules/contrib/src/retina.cpp
	modules/gpu/doc/camera_calibration_and_3d_reconstruction.rst
	modules/gpu/doc/video.rst
	modules/gpu/src/speckle_filtering.cpp
	modules/python/src2/cv2.cv.hpp
	modules/python/test/test2.py
	samples/python/watershed.py

modules/calib3d/doc/calib3d.rst

@@ -6,4 +6,3 @@ calib3d. Camera Calibration and 3D Reconstruction
     :maxdepth: 2
 
     camera_calibration_and_3d_reconstruction
-

modules/calib3d/src/epnp.cpp

@@ -621,4 +621,3 @@ void epnp::qr_solve(CvMat * A, CvMat * b, CvMat * X)
     pX[i] = (pb[i] - sum) / A2[i];
   }
 }
-

modules/calib3d/src/p3p.cpp

@@ -411,4 +411,3 @@ bool p3p::jacobi_4x4(double * A, double * D, double * U)
 
     return false;
 }
-

modules/calib3d/src/p3p.h

@@ -59,4 +59,3 @@ class p3p
 };
 
 #endif // P3P_H
-

modules/calib3d/src/solvepnp.cpp

@@ -348,4 +348,3 @@ void cv::solvePnPRansac(InputArray _opoints, InputArray _ipoints,
     }
     return;
 }
-

modules/calib3d/test/test_affine3d_estimator.cpp

@@ -195,4 +195,3 @@ void CV_Affine3D_EstTest::run( int /* start_from */)
 }
 
 TEST(Calib3d_EstimateAffineTransform, accuracy) { CV_Affine3D_EstTest test; test.safe_run(); }
-

modules/calib3d/test/test_cameracalibration_badarg.cpp

@@ -735,5 +735,3 @@ protected:
 TEST(Calib3d_CalibrateCamera_C, badarg) { CV_CameraCalibrationBadArgTest test; test.safe_run(); }
 TEST(Calib3d_Rodrigues_C, badarg) { CV_Rodrigues2BadArgTest test; test.safe_run(); }
 TEST(Calib3d_ProjectPoints_C, badarg) { CV_ProjectPoints2BadArgTest test; test.safe_run(); }
-
-

modules/calib3d/test/test_chessboardgenerator.cpp

@@ -329,4 +329,3 @@ Mat cv::ChessBoardGenerator::operator ()(const Mat& bg, const Mat& camMat, const
     return generateChessBoard(bg, camMat, distCoeffs, zero, pb1, pb2,
         squareSize.width, squareSize.height,  pts3d, corners);
 }
-

modules/calib3d/test/test_compose_rt.cpp

@@ -212,4 +212,3 @@ protected:
 };
 
 TEST(Calib3d_ComposeRT, accuracy) { CV_composeRT_Test test; test.safe_run(); }
-

modules/calib3d/test/test_precomp.hpp

@@ -21,4 +21,3 @@ namespace cvtest
 }
 
 #endif
-

modules/calib3d/test/test_reproject_image_to_3d.cpp

@@ -173,4 +173,3 @@ protected:
 };
 
 TEST(Calib3d_ReprojectImageTo3D, accuracy) { CV_ReprojectImageTo3DTest test; test.safe_run(); }
-

modules/calib3d/test/test_solvepnp_ransac.cpp

@@ -306,4 +306,4 @@ TEST(DISABLED_Calib3d_SolvePnPRansac, concurrency)
     EXPECT_LT(tnorm, 1e-6);
 
 }
-#endif
+#endif

modules/calib3d/test/test_undistort_points.cpp

@@ -94,4 +94,4 @@ void CV_UndistortTest::run(int /* start_from */)
     }
 }
 
-TEST(Calib3d_Undistort, accuracy) { CV_UndistortTest test; test.safe_run(); }
+TEST(Calib3d_Undistort, accuracy) { CV_UndistortTest test; test.safe_run(); }