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

samples/cpp/CMakeLists.txt

@@ -95,4 +95,3 @@ if (INSTALL_C_EXAMPLES AND NOT WIN32)
           DESTINATION share/OpenCV/samples/cpp
           PERMISSIONS OWNER_READ GROUP_READ WORLD_READ)
 endif()
-

samples/cpp/OpenEXRimages_HighDynamicRange_Retina_toneMapping.cpp

@@ -302,5 +302,3 @@ static void drawPlot(const cv::Mat curve, const std::string figureTitle, const i
 
      return 0;
  }
-
-

samples/cpp/OpenEXRimages_HighDynamicRange_Retina_toneMapping_video.cpp

@@ -359,5 +359,3 @@ static void loadNewFrame(const std::string filenamePrototype, const int currentF
 
      return 0;
  }
-
-

samples/cpp/bgfg_gmg.cpp

@@ -78,4 +78,3 @@ int main(int argc, char** argv)
 
     return 0;
 }
-

samples/cpp/calibration_artificial.cpp

@@ -332,4 +332,3 @@ Mat cv::ChessBoardGenerator::operator ()(const Mat& bg, const Mat& camMat, const
 
     return generageChessBoard(bg, camMat, distCoeffs, zero, pb1, pb2, sqWidth, sqHeight,  pts3d, corners);
 }
-

samples/cpp/dft.cpp

@@ -80,4 +80,3 @@ int main(int argc, const char ** argv)
     waitKey();
     return 0;
 }
-

samples/cpp/houghlines.cpp

@@ -61,4 +61,3 @@ int main(int argc, char** argv)
 
     return 0;
 }
-

samples/cpp/phase_corr.cpp

@@ -43,7 +43,3 @@ int main(int, char* [])
 
     return 0;
 }
-
-
-
-

samples/cpp/retinaDemo.cpp

@@ -156,4 +156,3 @@ int main(int argc, char* argv[]) {
 
     return 0;
 }
-

samples/cpp/stereo_calib.cpp

@@ -401,4 +401,3 @@ int main(int argc, char** argv)
     StereoCalib(imagelist, boardSize, true, showRectified);
     return 0;
 }
-

samples/cpp/stitching.cpp

@@ -134,5 +134,3 @@ int parseCmdArgs(int argc, char** argv)
     }
     return 0;
 }
-
-

samples/cpp/stitching_detailed.cpp

@@ -771,5 +771,3 @@ int main(int argc, char* argv[])
     LOGLN("Finished, total time: " << ((getTickCount() - app_start_time) / getTickFrequency()) << " sec");
     return 0;
 }
-
-

samples/cpp/tutorial_code/ImgProc/Morphology_2.cpp

@@ -76,5 +76,3 @@ void Morphology_Operations( int, void* )
   morphologyEx( src, dst, operation, element );
   imshow( window_name, dst );
 }
-
-

samples/cpp/tutorial_code/ImgProc/Pyramids.cpp

@@ -66,10 +66,3 @@ int main( void )
 
    return 0;
 }
-
-
-
-
-
-
-

samples/cpp/tutorial_code/ImgTrans/Sobel_Demo.cpp

@@ -61,5 +61,3 @@ int main( int, char** argv )
 
   return 0;
 }
-
-

samples/cpp/tutorial_code/ImgTrans/copyMakeBorder_demo.cpp

@@ -71,5 +71,3 @@ int main( int, char** argv )
 
   return 0;
 }
-
-

samples/cpp/tutorial_code/ShapeDescriptors/moments_demo.cpp

@@ -92,4 +92,3 @@ void thresh_callback(int, void* )
        circle( drawing, mc[i], 4, color, -1, 8, 0 );
      }
 }
-

samples/cpp/tutorial_code/ShapeDescriptors/pointPolygonTest_demo.cpp

@@ -79,5 +79,3 @@ int main( void )
   waitKey(0);
   return(0);
 }
-
-

samples/cpp/tutorial_code/TrackingMotion/cornerDetector_Demo.cpp

@@ -120,4 +120,3 @@ void myHarris_function( int, void* )
      }
   imshow( myHarris_window, myHarris_copy );
 }
-

samples/cpp/tutorial_code/TrackingMotion/cornerSubPix_Demo.cpp

@@ -102,4 +102,3 @@ void goodFeaturesToTrack_Demo( int, void* )
   for( size_t i = 0; i < corners.size(); i++ )
      { cout<<" -- Refined Corner ["<<i<<"]  ("<<corners[i].x<<","<<corners[i].y<<")"<<endl; }
 }
-

samples/cpp/tutorial_code/TrackingMotion/goodFeaturesToTrack_Demo.cpp

@@ -90,4 +90,3 @@ void goodFeaturesToTrack_Demo( int, void* )
   namedWindow( source_window, WINDOW_AUTOSIZE );
   imshow( source_window, copy );
 }
-

samples/cpp/tutorial_code/core/Matrix/Drawing_1.cpp

@@ -168,5 +168,3 @@ void MyLine( Mat img, Point start, Point end )
     thickness,
     lineType );
 }
-
-

samples/cpp/tutorial_code/core/discrete_fourier_transform/discrete_fourier_transform.cpp

@@ -75,4 +75,4 @@ int main(int argc, char ** argv)
     waitKey();
 
     return 0;
-}
+}

samples/cpp/tutorial_code/core/file_input_output/file_input_output.cpp

@@ -151,4 +151,4 @@ int main(int ac, char** av)
         << "Tip: Open up " << filename << " with a text editor to see the serialized data." << endl;
 
     return 0;
-}
+}

samples/cpp/tutorial_code/core/how_to_scan_images/how_to_scan_images.cpp

@@ -214,4 +214,4 @@ Mat& ScanImageAndReduceRandomAccess(Mat& I, const uchar* const table)
     }
 
     return I;
-}
+}

samples/cpp/tutorial_code/core/mat_mask_operations/mat_mask_operations.cpp

@@ -84,4 +84,4 @@ void Sharpen(const Mat& myImage,Mat& Result)
     Result.row(Result.rows-1).setTo(Scalar(0));
     Result.col(0).setTo(Scalar(0));
     Result.col(Result.cols-1).setTo(Scalar(0));
-}
+}

samples/cpp/tutorial_code/core/mat_the_basic_image_container/mat_the_basic_image_container.cpp

@@ -82,4 +82,4 @@ int main(int,char**)
 
     cout << "A vector of 2D Points = " << vPoints << endl << endl;
     return 0;
-}
+}

samples/cpp/tutorial_code/gpu/gpu-basics-similarity/gpu-basics-similarity.cpp

@@ -430,4 +430,3 @@ Scalar getMSSIM_GPU_optimized( const Mat& i1, const Mat& i2, BufferMSSIM& b)
     }
     return mssim;
 }
-

samples/cpp/tutorial_code/introduction/display_image/display_image.cpp

@@ -27,4 +27,4 @@ int main( int argc, char** argv )
 
     waitKey(0); // Wait for a keystroke in the window
     return 0;
-}
+}

samples/cpp/tutorial_code/introduction/windows_visual_studio_Opencv/Test.cpp

@@ -203,4 +203,4 @@ Scalar getMSSIM( const Mat& i1, const Mat& i2)
 
     Scalar mssim = mean( ssim_map ); // mssim = average of ssim map
     return mssim;
-}
+}

samples/cpp/tutorial_code/ml/non_linear_svms/non_linear_svms.cpp

@@ -127,4 +127,4 @@ int main()
     imwrite("result.png", I);	                   // save the Image
     imshow("SVM for Non-Linear Training Data", I); // show it to the user
     waitKey(0);
-}
+}