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/features2d/CMakeLists.txt

@@ -1,3 +1,2 @@
 set(the_description "2D Features Framework")
 ocv_define_module(features2d opencv_imgproc opencv_flann OPTIONAL opencv_highgui)
-

modules/features2d/doc/common_interfaces_of_generic_descriptor_matchers.rst

@@ -274,5 +274,3 @@ Example: ::
 
     VectorDescriptorMatcher matcher( new SurfDescriptorExtractor,
                                      new BruteForceMatcher<L2<float> > );
-
-

modules/features2d/perf/perf_fast.cpp

@@ -41,4 +41,3 @@ PERF_TEST_P(fast, detect, testing::Combine(
 
     SANITY_CHECK_KEYPOINTS(points);
 }
-

modules/features2d/src/bagofwords.cpp

@@ -176,10 +176,10 @@ void BOWImgDescriptorExtractor::compute( const Mat& image, std::vector<KeyPoint>
 
     // Normalize image descriptor.
     imgDescriptor /= descriptors.rows;
-	
+
     // Add the descriptors of image keypoints
     if (_descriptors) {
-        *_descriptors = descriptors.clone(); 
+        *_descriptors = descriptors.clone();
     }
 }
 

modules/features2d/src/evaluation.cpp

@@ -257,7 +257,7 @@ struct IntersectAreaCounter
     {
         CV_Assert( miny < maxy );
         CV_Assert( dr > FLT_EPSILON );
-        
+
         int temp_bua = bua, temp_bna = bna;
         for( int i = range.begin(); i != range.end(); i++ )
         {

modules/features2d/src/fast_score.cpp

@@ -357,4 +357,3 @@ int cornerScore<8>(const uchar* ptr, const int pixel[], int threshold)
 }
 
 } // namespace cv
-

modules/features2d/test/test_brisk.cpp

@@ -93,4 +93,3 @@ void CV_BRISKTest::run( int )
 }
 
 TEST(Features2d_BRISK, regression) { CV_BRISKTest test; test.safe_run(); }
-

modules/features2d/test/test_fast.cpp

@@ -135,4 +135,3 @@ void CV_FastTest::run( int )
 }
 
 TEST(Features2d_FAST, regression) { CV_FastTest test; test.safe_run(); }
-

modules/features2d/test/test_keypoints.cpp

@@ -166,5 +166,3 @@ TEST(Features2d_Detector_Keypoints_Dense, validation)
     CV_FeatureDetectorKeypointsTest test(Algorithm::create<FeatureDetector>("Feature2D.Dense"));
     test.safe_run();
 }
-
-

modules/features2d/test/test_mser.cpp

@@ -205,4 +205,3 @@ void CV_MserTest::run(int)
 }
 
 TEST(Features2d_MSER, DISABLED_regression) { CV_MserTest test; test.safe_run(); }
-