Merge branch 'master' into gpu-cuda-rename

Conflicts:
	modules/core/include/opencv2/core/cuda.hpp
	modules/cudacodec/src/thread.cpp
	modules/cudacodec/src/thread.hpp
	modules/superres/perf/perf_superres.cpp
	modules/superres/src/btv_l1_cuda.cpp
	modules/superres/src/optical_flow.cpp
	modules/videostab/src/global_motion.cpp
	modules/videostab/src/inpainting.cpp
	samples/cpp/stitching_detailed.cpp
	samples/cpp/videostab.cpp
	samples/gpu/stereo_multi.cpp

modules/cudaimgproc/src/canny.cpp

@@ -228,7 +228,7 @@ namespace
 
 Ptr<CannyEdgeDetector> cv::cuda::createCannyEdgeDetector(double low_thresh, double high_thresh, int apperture_size, bool L2gradient)
 {
-    return new CannyImpl(low_thresh, high_thresh, apperture_size, L2gradient);
+    return makePtr<CannyImpl>(low_thresh, high_thresh, apperture_size, L2gradient);
 }
 
 #endif /* !defined (HAVE_CUDA) */

modules/cudaimgproc/src/corners.cpp

@@ -178,12 +178,12 @@ namespace
 
 Ptr<cuda::CornernessCriteria> cv::cuda::createHarrisCorner(int srcType, int blockSize, int ksize, double k, int borderType)
 {
-    return new Harris(srcType, blockSize, ksize, k, borderType);
+    return makePtr<Harris>(srcType, blockSize, ksize, k, borderType);
 }
 
 Ptr<cuda::CornernessCriteria> cv::cuda::createMinEigenValCorner(int srcType, int blockSize, int ksize, int borderType)
 {
-    return new MinEigenVal(srcType, blockSize, ksize, borderType);
+    return makePtr<MinEigenVal>(srcType, blockSize, ksize, borderType);
 }
 
 #endif /* !defined (HAVE_CUDA) */

modules/cudaimgproc/src/generalized_hough.cpp

@@ -554,7 +554,7 @@ namespace
 
 Ptr<GeneralizedHoughBallard> cv::cuda::createGeneralizedHoughBallard()
 {
-    return new GeneralizedHoughBallardImpl;
+    return makePtr<GeneralizedHoughBallardImpl>();
 }
 
 // GeneralizedHoughGuil
@@ -900,7 +900,7 @@ namespace
 
 Ptr<GeneralizedHoughGuil> cv::cuda::createGeneralizedHoughGuil()
 {
-    return new GeneralizedHoughGuilImpl;
+    return makePtr<GeneralizedHoughGuilImpl>();
 }
 
 #endif /* !defined (HAVE_CUDA) */

modules/cudaimgproc/src/gftt.cpp

@@ -209,7 +209,8 @@ namespace
 Ptr<cuda::CornersDetector> cv::cuda::createGoodFeaturesToTrackDetector(int srcType, int maxCorners, double qualityLevel, double minDistance,
                                                                      int blockSize, bool useHarrisDetector, double harrisK)
 {
-    return new GoodFeaturesToTrackDetector(srcType, maxCorners, qualityLevel, minDistance, blockSize, useHarrisDetector, harrisK);
+    return Ptr<cuda::CornersDetector>(
+        new GoodFeaturesToTrackDetector(srcType, maxCorners, qualityLevel, minDistance, blockSize, useHarrisDetector, harrisK));
 }
 
 #endif /* !defined (HAVE_CUDA) */

modules/cudaimgproc/src/histogram.cpp

@@ -257,7 +257,7 @@ namespace
 
 cv::Ptr<cv::cuda::CLAHE> cv::cuda::createCLAHE(double clipLimit, cv::Size tileGridSize)
 {
-    return new CLAHE_Impl(clipLimit, tileGridSize.width, tileGridSize.height);
+    return makePtr<CLAHE_Impl>(clipLimit, tileGridSize.width, tileGridSize.height);
 }
 
 ////////////////////////////////////////////////////////////////////////

modules/cudaimgproc/src/hough_circles.cpp

@@ -291,7 +291,7 @@ namespace
 
 Ptr<HoughCirclesDetector> cv::cuda::createHoughCirclesDetector(float dp, float minDist, int cannyThreshold, int votesThreshold, int minRadius, int maxRadius, int maxCircles)
 {
-    return new HoughCirclesDetectorImpl(dp, minDist, cannyThreshold, votesThreshold, minRadius, maxRadius, maxCircles);
+    return makePtr<HoughCirclesDetectorImpl>(dp, minDist, cannyThreshold, votesThreshold, minRadius, maxRadius, maxCircles);
 }
 
 #endif /* !defined (HAVE_CUDA) */

modules/cudaimgproc/src/hough_lines.cpp

@@ -196,7 +196,7 @@ namespace
 
 Ptr<HoughLinesDetector> cv::cuda::createHoughLinesDetector(float rho, float theta, int threshold, bool doSort, int maxLines)
 {
-    return new HoughLinesDetectorImpl(rho, theta, threshold, doSort, maxLines);
+    return makePtr<HoughLinesDetectorImpl>(rho, theta, threshold, doSort, maxLines);
 }
 
 #endif /* !defined (HAVE_CUDA) */

modules/cudaimgproc/src/hough_segments.cpp

@@ -177,7 +177,7 @@ namespace
 
 Ptr<HoughSegmentDetector> cv::cuda::createHoughSegmentDetector(float rho, float theta, int minLineLength, int maxLineGap, int maxLines)
 {
-    return new HoughSegmentDetectorImpl(rho, theta, minLineLength, maxLineGap, maxLines);
+    return makePtr<HoughSegmentDetectorImpl>(rho, theta, minLineLength, maxLineGap, maxLines);
 }
 
 #endif /* !defined (HAVE_CUDA) */

modules/cudaimgproc/src/match_template.cpp

@@ -607,10 +607,10 @@ Ptr<cuda::TemplateMatching> cv::cuda::createTemplateMatching(int srcType, int me
         switch (method)
         {
         case TM_SQDIFF:
-            return new Match_SQDIFF_32F;
+            return makePtr<Match_SQDIFF_32F>();
 
         case TM_CCORR:
-            return new Match_CCORR_32F(user_block_size);
+            return makePtr<Match_CCORR_32F>(user_block_size);
 
         default:
             CV_Error( Error::StsBadFlag, "Unsopported method" );
@@ -622,22 +622,22 @@ Ptr<cuda::TemplateMatching> cv::cuda::createTemplateMatching(int srcType, int me
         switch (method)
         {
         case TM_SQDIFF:
-            return new Match_SQDIFF_8U(user_block_size);
+            return makePtr<Match_SQDIFF_8U>(user_block_size);
 
         case TM_SQDIFF_NORMED:
-            return new Match_SQDIFF_NORMED_8U(user_block_size);
+            return makePtr<Match_SQDIFF_NORMED_8U>(user_block_size);
 
         case TM_CCORR:
-            return new Match_CCORR_8U(user_block_size);
+            return makePtr<Match_CCORR_8U>(user_block_size);
 
         case TM_CCORR_NORMED:
-            return new Match_CCORR_NORMED_8U(user_block_size);
+            return makePtr<Match_CCORR_NORMED_8U>(user_block_size);
 
         case TM_CCOEFF:
-            return new Match_CCOEFF_8U(user_block_size);
+            return makePtr<Match_CCOEFF_8U>(user_block_size);
 
         case TM_CCOEFF_NORMED:
-            return new Match_CCOEFF_NORMED_8U(user_block_size);
+            return makePtr<Match_CCOEFF_NORMED_8U>(user_block_size);
 
         default:
             CV_Error( Error::StsBadFlag, "Unsopported method" );