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/cudaarithm/src/arithm.cpp

@@ -629,7 +629,7 @@ Ptr<Convolution> cv::cuda::createConvolution(Size user_block_size)
     CV_Error(Error::StsNotImplemented, "The library was build without CUFFT");
     return Ptr<Convolution>();
 #else
-    return new ConvolutionImpl(user_block_size);
+    return makePtr<ConvolutionImpl>(user_block_size);
 #endif
 }
 

modules/cudaarithm/src/core.cpp

@@ -497,7 +497,7 @@ namespace
 
 Ptr<LookUpTable> cv::cuda::createLookUpTable(InputArray lut)
 {
-    return new LookUpTableImpl(lut);
+    return makePtr<LookUpTableImpl>(lut);
 }
 
 ////////////////////////////////////////////////////////////////////////