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/superres/src/btv_l1.cpp

@@ -337,7 +337,7 @@ namespace
 
         // update blur filter and btv weights
 
-        if (filter_.empty() || blurKernelSize_ != curBlurKernelSize_ || blurSigma_ != curBlurSigma_ || src[0].type() != curSrcType_)
+        if (!filter_ || blurKernelSize_ != curBlurKernelSize_ || blurSigma_ != curBlurSigma_ || src[0].type() != curSrcType_)
         {
             filter_ = createGaussianFilter(src[0].type(), Size(blurKernelSize_, blurKernelSize_), blurSigma_);
             curBlurKernelSize_ = blurKernelSize_;
@@ -614,5 +614,5 @@ namespace
 
 Ptr<SuperResolution> cv::superres::createSuperResolution_BTVL1()
 {
-    return new BTVL1;
+    return makePtr<BTVL1>();
 }

modules/superres/src/btv_l1_cuda.cpp

@@ -578,7 +578,7 @@ namespace
 
 Ptr<SuperResolution> cv::superres::createSuperResolution_BTVL1_CUDA()
 {
-    return new BTVL1_CUDA;
+    return makePtr<BTVL1_CUDA>();
 }
 
 #endif // HAVE_CUDA

modules/superres/src/btv_l1_ocl.cpp

@@ -743,6 +743,6 @@ namespace
 
 Ptr<SuperResolution> cv::superres::createSuperResolution_BTVL1_OCL()
 {
-    return new BTVL1_OCL;
+    return makePtr<BTVL1_OCL>();
 }
 #endif

modules/superres/src/frame_source.cpp

@@ -74,7 +74,7 @@ namespace
 
 Ptr<FrameSource> cv::superres::createFrameSource_Empty()
 {
-    return new EmptyFrameSource;
+    return makePtr<EmptyFrameSource>();
 }
 
 //////////////////////////////////////////////////////
@@ -186,12 +186,12 @@ namespace
 
 Ptr<FrameSource> cv::superres::createFrameSource_Video(const String& fileName)
 {
-    return new VideoFrameSource(fileName);
+    return makePtr<VideoFrameSource>(fileName);
 }
 
 Ptr<FrameSource> cv::superres::createFrameSource_Camera(int deviceId)
 {
-    return new CameraFrameSource(deviceId);
+    return makePtr<CameraFrameSource>(deviceId);
 }
 
 #endif // HAVE_OPENCV_HIGHGUI
@@ -257,7 +257,7 @@ namespace
 
 Ptr<FrameSource> cv::superres::createFrameSource_Video_CUDA(const String& fileName)
 {
-    return new VideoFrameSource(fileName);
+    return makePtr<VideoFrameSource>(fileName);
 }
 
 #endif // HAVE_OPENCV_CUDACODEC

modules/superres/src/optical_flow.cpp

@@ -169,7 +169,7 @@ namespace
 
 Ptr<DenseOpticalFlowExt> cv::superres::createOptFlow_Farneback()
 {
-    return new Farneback;
+    return makePtr<Farneback>();
 }
 
 ///////////////////////////////////////////////////////////////////
@@ -258,7 +258,7 @@ namespace
 
 Ptr<DenseOpticalFlowExt> cv::superres::createOptFlow_Simple()
 {
-    return new Simple;
+    return makePtr<Simple>();
 }
 
 ///////////////////////////////////////////////////////////////////
@@ -337,7 +337,7 @@ namespace
 
 Ptr<DenseOpticalFlowExt> cv::superres::createOptFlow_DualTVL1()
 {
-    return new DualTVL1;
+    return makePtr<DualTVL1>();
 }
 
 ///////////////////////////////////////////////////////////////////
@@ -503,7 +503,7 @@ namespace
 
 Ptr<DenseOpticalFlowExt> cv::superres::createOptFlow_Brox_CUDA()
 {
-    return new Brox_CUDA;
+    return makePtr<Brox_CUDA>();
 }
 
 ///////////////////////////////////////////////////////////////////
@@ -562,7 +562,7 @@ namespace
 
 Ptr<DenseOpticalFlowExt> cv::superres::createOptFlow_PyrLK_CUDA()
 {
-    return new PyrLK_CUDA;
+    return makePtr<PyrLK_CUDA>();
 }
 
 ///////////////////////////////////////////////////////////////////
@@ -636,7 +636,7 @@ namespace
 
 Ptr<DenseOpticalFlowExt> cv::superres::createOptFlow_Farneback_CUDA()
 {
-    return new Farneback_CUDA;
+    return makePtr<Farneback_CUDA>();
 }
 
 ///////////////////////////////////////////////////////////////////
@@ -714,7 +714,7 @@ namespace
 
 Ptr<DenseOpticalFlowExt> cv::superres::createOptFlow_DualTVL1_CUDA()
 {
-    return new DualTVL1_CUDA;
+    return makePtr<DualTVL1_CUDA>();
 }
 
 #endif // HAVE_OPENCV_CUDAOPTFLOW
@@ -827,7 +827,7 @@ namespace
 
 Ptr<DenseOpticalFlowExt> cv::superres::createOptFlow_PyrLK_OCL()
 {
-    return new PyrLK_OCL;
+    return makePtr<PyrLK_OCL>();
 }
 
 ///////////////////////////////////////////////////////////////////
@@ -906,7 +906,7 @@ namespace
 
 Ptr<DenseOpticalFlowExt> cv::superres::createOptFlow_DualTVL1_OCL()
 {
-    return new DualTVL1_OCL;
+    return makePtr<DualTVL1_OCL>();
 }
 
 ///////////////////////////////////////////////////////////////////
@@ -980,7 +980,7 @@ namespace
 
 Ptr<DenseOpticalFlowExt> cv::superres::createOptFlow_Farneback_OCL()
 {
-    return new FarneBack_OCL;
+    return makePtr<FarneBack_OCL>();
 }
 
 #endif