mirror of
https://github.com/opencv/opencv.git
synced 2026-07-31 00:03:03 +04:00
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
This commit is contained in:
@@ -200,7 +200,7 @@ namespace
|
||||
|
||||
Ptr<cuda::DisparityBilateralFilter> cv::cuda::createDisparityBilateralFilter(int ndisp, int radius, int iters)
|
||||
{
|
||||
return new DispBilateralFilterImpl(ndisp, radius, iters);
|
||||
return makePtr<DispBilateralFilterImpl>(ndisp, radius, iters);
|
||||
}
|
||||
|
||||
#endif /* !defined (HAVE_CUDA) */
|
||||
|
||||
@@ -179,7 +179,7 @@ namespace
|
||||
|
||||
Ptr<cuda::StereoBM> cv::cuda::createStereoBM(int numDisparities, int blockSize)
|
||||
{
|
||||
return new StereoBMImpl(numDisparities, blockSize);
|
||||
return makePtr<StereoBMImpl>(numDisparities, blockSize);
|
||||
}
|
||||
|
||||
#endif /* !defined (HAVE_CUDA) */
|
||||
|
||||
@@ -361,7 +361,7 @@ namespace
|
||||
|
||||
Ptr<cuda::StereoBeliefPropagation> cv::cuda::createStereoBeliefPropagation(int ndisp, int iters, int levels, int msg_type)
|
||||
{
|
||||
return new StereoBPImpl(ndisp, iters, levels, msg_type);
|
||||
return makePtr<StereoBPImpl>(ndisp, iters, levels, msg_type);
|
||||
}
|
||||
|
||||
void cv::cuda::StereoBeliefPropagation::estimateRecommendedParams(int width, int height, int& ndisp, int& iters, int& levels)
|
||||
|
||||
@@ -366,7 +366,7 @@ namespace
|
||||
|
||||
Ptr<cuda::StereoConstantSpaceBP> cv::cuda::createStereoConstantSpaceBP(int ndisp, int iters, int levels, int nr_plane, int msg_type)
|
||||
{
|
||||
return new StereoCSBPImpl(ndisp, iters, levels, nr_plane, msg_type);
|
||||
return makePtr<StereoCSBPImpl>(ndisp, iters, levels, nr_plane, msg_type);
|
||||
}
|
||||
|
||||
void cv::cuda::StereoConstantSpaceBP::estimateRecommendedParams(int width, int height, int& ndisp, int& iters, int& levels, int& nr_plane)
|
||||
|
||||
Reference in New Issue
Block a user