generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' into gpu-cuda-rename

Browse Source 
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:
Vladislav Vinogradov
2013-09-06 15:44:44 +04:00
parent f46b7fcf86
commit 0c7663eb3b
184 changed files with 2414 additions and 1467 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
modules/core/src/cuda_stream.cpp
View File

@@ -100,7 +100,7 @@ cv::cuda::Stream::Stream()
#ifndef HAVE_CUDA
throw_no_cuda();
#else
impl_ = new Impl;
impl_ = makePtr<Impl>();
#endif
}
@@ -182,7 +182,7 @@ void cv::cuda::Stream::enqueueHostCallback(StreamCallback callback, void* userDa
Stream& cv::cuda::Stream::Null()
{
static Stream s(new Impl(0));
static Stream s(Ptr<Impl>(new Impl(0)));
return s;
}
@@ -195,10 +195,6 @@ cv::cuda::Stream::operator bool_type() const
#endif
}
template <> void cv::Ptr<Stream::Impl>::delete_obj()
{
if (obj) delete obj;
}
////////////////////////////////////////////////////////////////
// Stream
@@ -249,7 +245,7 @@ cv::cuda::Event::Event(CreateFlags flags)
(void) flags;
throw_no_cuda();
#else
impl_ = new Impl(flags);
impl_ = makePtr<Impl>(flags);
#endif
}
@@ -301,8 +297,3 @@ float cv::cuda::Event::elapsedTime(const Event& start, const Event& end)
return ms;
#endif
}
template <> void cv::Ptr<Event::Impl>::delete_obj()
{
if (obj) delete obj;
}