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/ocl/perf/perf_arithm.cpp

@@ -1194,4 +1194,4 @@ PERFTEST(AddWeighted)
         }
 
     }
-}
+}

modules/ocl/perf/perf_blend.cpp

@@ -119,4 +119,4 @@ PERFTEST(blend)
             TestSystem::instance().ExpectedMatNear(dst, ocl_dst, 1.f);
         }
     }
-}
+}

modules/ocl/perf/perf_brute_force_matcher.cpp

@@ -164,4 +164,4 @@ PERFTEST(BruteForceMatcher)
         else
             TestSystem::instance().setAccurate(0, diff);
     }
-}
+}

modules/ocl/perf/perf_calib3d.cpp

@@ -48,14 +48,14 @@
 ///////////// StereoMatchBM ////////////////////////
 PERFTEST(StereoMatchBM)
 {
-	Mat left_image = imread(abspath("aloeL.jpg"), cv::IMREAD_GRAYSCALE);
-	Mat right_image = imread(abspath("aloeR.jpg"), cv::IMREAD_GRAYSCALE);
-	Mat disp,dst;
-	ocl::oclMat d_left, d_right,d_disp;
-	int n_disp= 128;
-	int winSize =19;
+    Mat left_image = imread(abspath("aloeL.jpg"), cv::IMREAD_GRAYSCALE);
+    Mat right_image = imread(abspath("aloeR.jpg"), cv::IMREAD_GRAYSCALE);
+    Mat disp,dst;
+    ocl::oclMat d_left, d_right,d_disp;
+    int n_disp= 128;
+    int winSize =19;
 
-	SUBTEST << left_image.cols << 'x' << left_image.rows << "; aloeL.jpg ;"<< right_image.cols << 'x' << right_image.rows << "; aloeR.jpg ";
+    SUBTEST << left_image.cols << 'x' << left_image.rows << "; aloeL.jpg ;"<< right_image.cols << 'x' << right_image.rows << "; aloeR.jpg ";
 
 	Ptr<StereoBM> bm = createStereoBM(n_disp, winSize);
 	bm->compute(left_image, right_image, dst);
@@ -64,38 +64,29 @@ PERFTEST(StereoMatchBM)
 	bm->compute(left_image, right_image, dst);
 	CPU_OFF;
 
-	d_left.upload(left_image);
-	d_right.upload(right_image);
+    d_left.upload(left_image);
+    d_right.upload(right_image);
 
-	ocl::StereoBM_OCL d_bm(0, n_disp, winSize);
+    ocl::StereoBM_OCL d_bm(0, n_disp, winSize);
 
-	WARMUP_ON;
-	d_bm(d_left, d_right, d_disp);
-	WARMUP_OFF;
+    WARMUP_ON;
+    d_bm(d_left, d_right, d_disp);
+    WARMUP_OFF;
 
     cv::Mat ocl_mat;
     d_disp.download(ocl_mat);
     ocl_mat.convertTo(ocl_mat, dst.type());
 
-	GPU_ON;
-	d_bm(d_left, d_right, d_disp);
-	GPU_OFF;
+    GPU_ON;
+    d_bm(d_left, d_right, d_disp);
+    GPU_OFF;
+
+    GPU_FULL_ON;
+    d_left.upload(left_image);
+    d_right.upload(right_image);
+    d_bm(d_left, d_right, d_disp);
+    d_disp.download(disp);
+    GPU_FULL_OFF;
 
-	GPU_FULL_ON;
-	d_left.upload(left_image);
-	d_right.upload(right_image);
-	d_bm(d_left, d_right, d_disp);
-	d_disp.download(disp);
-	GPU_FULL_OFF;
-    
     TestSystem::instance().setAccurate(-1, 0.);
 }
-
-
-
-
-
-
-
-
-	

modules/ocl/perf/perf_canny.cpp

@@ -82,4 +82,4 @@ PERFTEST(Canny)
     GPU_FULL_OFF;
 
     TestSystem::instance().ExceptedMatSimilar(edges, ocl_edges, 2e-2);
-}
+}

modules/ocl/perf/perf_fft.cpp

@@ -88,4 +88,4 @@ PERFTEST(dft)
         }
 
     }
-}
+}

modules/ocl/perf/perf_filters.cpp

@@ -284,7 +284,7 @@ PERFTEST(GaussianBlur)
     Mat src, dst, ocl_dst;
     int all_type[] = {CV_8UC1, CV_8UC4, CV_32FC1, CV_32FC4};
     std::string type_name[] = {"CV_8UC1", "CV_8UC4", "CV_32FC1", "CV_32FC4"};
-    const int ksize = 7;	
+    const int ksize = 7;
 
     for (int size = Min_Size; size <= Max_Size; size *= Multiple)
     {
@@ -374,4 +374,4 @@ PERFTEST(filter2D)
 
 
     }
-}
+}

modules/ocl/perf/perf_gemm.cpp

@@ -87,4 +87,4 @@ PERFTEST(gemm)
 
         TestSystem::instance().ExpectedMatNear(ocl_dst, dst, src1.cols * src1.rows * 1e-4);
     }
-}
+}

modules/ocl/perf/perf_hog.cpp

@@ -77,7 +77,7 @@ PERFTEST(HOG)
     WARMUP_ON;
     ocl_hog.detectMultiScale(d_src, d_found_locations);
     WARMUP_OFF;
-    
+
     if(d_found_locations.size() == found_locations.size())
         TestSystem::instance().setAccurate(1, 0);
     else
@@ -91,4 +91,4 @@ PERFTEST(HOG)
     d_src.upload(src);
     ocl_hog.detectMultiScale(d_src, found_locations);
     GPU_FULL_OFF;
-}
+}

modules/ocl/perf/perf_matrix_operation.cpp

@@ -183,4 +183,4 @@ PERFTEST(setTo)
         }
 
     }
-}
+}

modules/ocl/perf/perf_norm.cpp

@@ -72,7 +72,7 @@ PERFTEST(norm)
         WARMUP_OFF;
 
         d_src1.download(ocl_src1);
-        TestSystem::instance().ExpectedMatNear(src1, ocl_src1, .5);                        
+        TestSystem::instance().ExpectedMatNear(src1, ocl_src1, .5);
 
         GPU_ON;
         ocl::norm(d_src1, d_src2, NORM_INF);
@@ -84,4 +84,4 @@ PERFTEST(norm)
         ocl::norm(d_src1, d_src2, NORM_INF);
         GPU_FULL_OFF;
     }
-}
+}

modules/ocl/perf/perf_pyramid.cpp

@@ -129,4 +129,4 @@ PERFTEST(pyrUp)
             TestSystem::instance().ExpectedMatNear(dst, ocl_dst, (src.depth() == CV_32F ? 1e-4f : 1.0));
         }
     }
-}
+}

modules/ocl/perf/perf_split_merge.cpp

@@ -133,7 +133,7 @@ PERFTEST(Split)
 
             WARMUP_ON;
             ocl::split(d_src, d_dst);
-            WARMUP_OFF;         
+            WARMUP_OFF;
 
             GPU_ON;
             ocl::split(d_src, d_dst);