mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-01-18 22:44:02 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #21374 from cudawarped:fix_cuda_event_flags

Browse Source 
Allow cv::cuda::Event to accept combinations of flags
This commit is contained in:
cudawarped 2022-01-11 20:57:25 +00:00 committed by GitHub
parent c3e27bcf87
commit ecfbaa267d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
modules/core/include/opencv2/core/cuda.hpp
View File

@ -924,7 +924,7 @@ public:
INTERPROCESS = 0x04 /**< Event is suitable for interprocess use. DisableTiming must be set */
};
CV_WRAP explicit Event(Event::CreateFlags flags = Event::CreateFlags::DEFAULT);
CV_WRAP explicit Event(const Event::CreateFlags flags = Event::CreateFlags::DEFAULT);
//! records an event
CV_WRAP void record(Stream& stream = Stream::Null());
@ -946,6 +946,7 @@ private:
friend struct EventAccessor;
};
CV_ENUM_FLAGS(Event::CreateFlags)
//! @} cudacore_struct

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

@ -811,7 +811,7 @@ Event cv::cuda::EventAccessor::wrapEvent(cudaEvent_t event)
#endif
cv::cuda::Event::Event(CreateFlags flags)
cv::cuda::Event::Event(const Event::CreateFlags flags)
{
#ifndef HAVE_CUDA
CV_UNUSED(flags);