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:
@@ -50,13 +50,13 @@ static const float WEIGHT_EPS = 1e-5f;
|
||||
Ptr<Blender> Blender::createDefault(int type, bool try_gpu)
|
||||
{
|
||||
if (type == NO)
|
||||
return new Blender();
|
||||
return makePtr<Blender>();
|
||||
if (type == FEATHER)
|
||||
return new FeatherBlender();
|
||||
return makePtr<FeatherBlender>();
|
||||
if (type == MULTI_BAND)
|
||||
return new MultiBandBlender(try_gpu);
|
||||
return makePtr<MultiBandBlender>(try_gpu);
|
||||
CV_Error(Error::StsBadArg, "unsupported blending method");
|
||||
return NULL;
|
||||
return Ptr<Blender>();
|
||||
}
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user