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/legacy/src/_vm.h

@@ -293,4 +293,3 @@ int icvSingularValueDecomposition(	int		M,
 
 /*======================================================================================*/
 #endif/*_CV_VM_H_*/
-

modules/legacy/src/bgfg_codebook.cpp

@@ -359,4 +359,3 @@ void cvBGCodeBookClearStale( CvBGCodeBookModel* model, int staleThresh,
 }
 
 /* End of file. */
-

modules/legacy/src/bgfg_common.cpp

@@ -135,4 +135,3 @@ cvSegmentFGMask( CvArr* _mask, int poly1Hull0, float perimScale,
 }
 
 /* End of file. */
-

modules/legacy/src/bgfg_gaussmix.cpp

@@ -1317,4 +1317,3 @@ icvUpdateGaussianBGModel2( IplImage* curr_frame, CvGaussBGModel2*  bg_model )
 }
 
 /* End of file. */
-

modules/legacy/src/blobtrack.cpp

@@ -637,4 +637,3 @@ void cvReleaseBlobTracker(CvBlobTracker**ppT )
     ppT[0]->Release();
     ppT[0] = 0;
 }
-

modules/legacy/src/blobtrackanalysis.cpp

@@ -125,4 +125,3 @@ CvBlobTrackAnalysis* cvCreateBlobTrackAnalysisList(CvBlobTrackAnalysisOne* (*cre
 }
 
 /* ======================== Analyser modules ============================= */
-

modules/legacy/src/blobtrackanalysisior.cpp

@@ -171,4 +171,3 @@ CvBlobTrackAnalysis* cvCreateModuleBlobTrackAnalysisIOR()
     return (CvBlobTrackAnalysis*)pIOR;
 }/* cvCreateCvBlobTrackAnalysisIOR */
 /* ======================== Analyser modules ============================= */
-

modules/legacy/src/blobtrackanalysistrackdist.cpp

@@ -578,4 +578,3 @@ public:
 
 CvBlobTrackAnalysis* cvCreateModuleBlobTrackAnalysisTrackDist()
 {return (CvBlobTrackAnalysis*) new CvBlobTrackAnalysisTrackDist;}
-

modules/legacy/src/blobtrackgen1.cpp

@@ -181,5 +181,3 @@ CvBlobTrackGen* cvCreateModuleBlobTrackGen1()
 {
     return (CvBlobTrackGen*) new CvBlobTrackGen1(0);
 }
-
-

modules/legacy/src/blobtrackgenyml.cpp

@@ -215,5 +215,3 @@ CvBlobTrackGen* cvCreateModuleBlobTrackGenYML()
 {
     return (CvBlobTrackGen*) new CvBlobTrackGenYML;
 }
-
-

modules/legacy/src/blobtrackingauto.cpp

@@ -479,4 +479,3 @@ void CvBlobTrackerAuto1::Process(IplImage* pImg, IplImage* pMask)
     TIME_END("TrackAnalysis",m_BlobList.GetBlobNum())
 
 } /* CvBlobTrackerAuto1::Process */
-

modules/legacy/src/blobtrackingmsfg.cpp

@@ -1179,4 +1179,3 @@ CvBlobTracker* cvCreateBlobTrackerMSPF()
 {
     return cvCreateBlobTrackerList(cvCreateBlobTrackerOneMSPF);
 }
-

modules/legacy/src/blobtrackingmsfgs.cpp

@@ -454,4 +454,3 @@ CvBlobTracker* cvCreateBlobTrackerMSFGS()
 {
     return cvCreateBlobTrackerList(cvCreateBlobTrackerOneMSFGS);
 }
-

modules/legacy/src/blobtrackpostprockalman.cpp

@@ -325,4 +325,3 @@ CvBlobTrackPredictor* cvCreateModuleBlobTrackPredictKalman()
     return (CvBlobTrackPredictor*) new CvBlobTrackPredictKalman;
 }
 /*======================= KALMAN PREDICTOR =========================*/
-

modules/legacy/src/calcimagehomography.cpp

@@ -111,4 +111,3 @@ cvCalcImageHomography( float* line, CvPoint3D32f* _center,
 }
 
 /* End of file. */
-

modules/legacy/src/calibfilter.cpp

@@ -919,5 +919,3 @@ bool CvCalibFilter::Undistort( CvMat** srcarr, CvMat** dstarr )
 
     return true;
 }
-
-

modules/legacy/src/clique.cpp

@@ -706,4 +706,3 @@ void cvBronKerbosch( CvGraph* graph )
 }//end cvBronKerbosch
 
 #endif
-

modules/legacy/src/decomppoly.cpp

@@ -626,4 +626,3 @@ void cvDecompPoly( CvContour* cont,
 #endif
 
 // End of file decomppoly.cpp
-

modules/legacy/src/dpstereo.cpp

@@ -551,4 +551,3 @@ cvFindStereoCorrespondence(
 }
 
 /* End of file. */
-

modules/legacy/src/enteringblobdetection.cpp

@@ -1060,5 +1060,3 @@ int CvBlobDetectorCC::DetectNewBlob(IplImage* /*pImg*/, IplImage* pFGMask, CvBlo
     return result;
 
 }   /* cvDetectNewBlob */
-
-

modules/legacy/src/enteringblobdetectionreal.cpp

@@ -161,4 +161,3 @@ public:
 
 /* Blob detector constructor: */
 //CvBlobDetector* cvCreateBlobDetectorReal(CvTestSeq* pTestSeq){return new CvBlobDetectorReal(pTestSeq);}
-

modules/legacy/src/epilines.cpp

@@ -3698,5 +3698,3 @@ int cvComputeEssentialMatrix(  CvMatr32f rotMatr,
 
     return CV_OK;
 }
-
-

modules/legacy/src/extendededges.cpp

@@ -263,7 +263,3 @@ CvSeq* icvCutContourRaster( CvSeq* current, CvMemStorage* storage, IplImage* ima
 
 */
 #endif /* WIN32 */
-
-
-
-

modules/legacy/src/face.cpp

@@ -351,4 +351,3 @@ inline void RFace::ResizeRect(CvRect Rect,CvRect * lpRect,long lDir,long lD)
     }
 
 }// inline void RFace::ResizeRect(CvRect * lpRect,long lDir,long lD)
-

modules/legacy/src/face.h

@@ -133,4 +133,3 @@ private:
 
 
 #endif //__FACE_H__
-

modules/legacy/src/facedetection.cpp

@@ -499,5 +499,3 @@ Face * FaceDetectionList::GetData()
     m_pCurElem = m_pCurElem->m_pNext;
     return m_pCurElem->m_pFace;
 }//Face * FaceDetectionList::GetData()
-
-

modules/legacy/src/facetemplate.h

@@ -199,4 +199,3 @@ inline MouthFaceTemplate::MouthFaceTemplate(long lNumber,CvRect rect,double dEye
 
 
 #endif//__FACETEMPLATE_H__
-

modules/legacy/src/features2d.cpp

@@ -122,5 +122,3 @@ cvGetStarKeypoints( const CvArr* _img, CvMemStorage* storage,
     }
     return seq;
 }
-
-

modules/legacy/src/findface.cpp

@@ -65,4 +65,3 @@ CvSeq * cvPostBoostingFindFace(IplImage * Image,CvMemStorage* lpStorage)
 
     return lpSeq;
 }//cvPostBoostingFindFace(IplImage * Image)
-

modules/legacy/src/findhandregion.cpp

@@ -631,4 +631,3 @@ cvFindHandRegionA( CvPoint3D32f * points, int count,
     IPPI_CALL( icvFindHandRegionA( points, count, indexs, line, size, jc,
                                     center, storage, numbers ));
 }
-

modules/legacy/src/hmm.cpp

@@ -1695,4 +1695,3 @@ cvMixSegmL2( CvImgObsInfo ** obs_info_array, int num_img, CvEHMM * hmm )
 }
 
 /* End of file */
-

modules/legacy/src/hmm1d.cpp

@@ -1148,4 +1148,3 @@ CvStatus icvEstimate1DHMMStateParams(CvImgObsInfo** obs_info_array, int num_img,
 
 
 #endif
-

modules/legacy/src/image.cpp

@@ -330,4 +330,3 @@ void CvMatrix::show( const char* window_name )
 
 
 /* End of file. */
-

modules/legacy/src/lcm.cpp

@@ -718,7 +718,3 @@ void _cvProjectionPointToSegment(CvPoint2D32f* PointO,
     PrPoint->y = PointO->y - VectorAO.y + alfa*VectorAB.y;
     return;
 }//end of _cvProjectionPointToSegment
-
-
-
-

modules/legacy/src/levmar.cpp

@@ -315,6 +315,3 @@ void TestOptimX2Y2()
 }
 
 #endif
-
-
-

modules/legacy/src/lines.cpp

@@ -477,4 +477,3 @@ cvPostWarpImage( int numLines,  /* number of scanlines  */
 }
 
 /* End of file */
-

modules/legacy/src/lmeds.cpp

@@ -1683,4 +1683,3 @@ icvPoint7( int *ml, int *mr, double *F, int *amount )
 
     return error;
 }                               /* icvPoint7 */
-

modules/legacy/src/morphing.cpp

@@ -389,4 +389,3 @@ cvMorphEpilinesMulti( int lines,        /* number of lines             */
                                           second_corr   /* correspond information for the 2nd seq     */
                 ));
 }
-

modules/legacy/src/testseq.cpp

@@ -1367,4 +1367,3 @@ void cvAddNoise(IplImage* pImg, int noise_type, double Ampl, CvRandState* rnd_st
     cvReleaseImage(&pImgAdd);
 
 }   /* cvAddNoise */
-

modules/legacy/src/texture.cpp

@@ -645,4 +645,3 @@ cvCreateGLCMImage( CvGLCM* GLCM, int step )
 
     return dest;
 }
-

modules/legacy/src/trifocal.cpp

@@ -2782,4 +2782,3 @@ static void icvDecomposeQ(CvMat* /*matrQ*/,CvMat* /*matrH*/)
 }
 
 #endif
-

modules/legacy/src/vecfacetracking.cpp

@@ -971,4 +971,3 @@ inline double CalculateTransformationLMS3_0( CvPoint* pTemplPoints, CvPoint* pSr
         dbLMS = dbXtXt + dbYtYt - ((double)pow(dbXtXs + dbYtYs,2) + (double)pow(dbXtYs - dbYtXs,2)) / del;
     return dbLMS;
 }
-

modules/legacy/src/video.cpp

@@ -80,5 +80,3 @@ cvDeInterlace( const CvArr* framearr, CvArr* fieldEven, CvArr* fieldOdd )
 }
 
 /* End of file. */
-
-