Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
O
opencv
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
opencv
Commits
9ac7aea9
Commit
9ac7aea9
authored
Sep 28, 2018
by
Alexander Alekhin
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #12653 from cv3d:cuda/legacy_traits
parents
9524abcd
5f17cc1a
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
13 additions
and
4 deletions
+13
-4
CMakeLists.txt
modules/core/CMakeLists.txt
+0
-4
pyopencv_cuda.hpp
modules/core/misc/python/pyopencv_cuda.hpp
+13
-0
No files found.
modules/core/CMakeLists.txt
View file @
9ac7aea9
...
...
@@ -81,10 +81,6 @@ if(HAVE_HPX)
ocv_target_link_libraries
(
${
the_module
}
LINK_PRIVATE
"
${
HPX_LIBRARIES
}
"
)
endif
()
if
(
HAVE_CUDA
)
ocv_target_compile_definitions
(
${
the_module
}
PUBLIC OPENCV_TRAITS_ENABLE_DEPRECATED
)
endif
()
ocv_add_accuracy_tests
()
ocv_add_perf_tests
()
...
...
modules/core/misc/python/pyopencv_c
ore
.hpp
→
modules/core/misc/python/pyopencv_c
uda
.hpp
View file @
9ac7aea9
...
...
@@ -7,6 +7,19 @@ typedef cuda::GpuMat::Allocator GpuMat_Allocator;
typedef
cuda
::
HostMem
::
AllocType
HostMem_AllocType
;
typedef
cuda
::
Event
::
CreateFlags
Event_CreateFlags
;
template
<>
struct
pyopencvVecConverter
<
cuda
::
GpuMat
>
{
static
bool
to
(
PyObject
*
obj
,
std
::
vector
<
cuda
::
GpuMat
>&
value
,
const
ArgInfo
info
)
{
return
pyopencv_to_generic_vec
(
obj
,
value
,
info
);
}
static
PyObject
*
from
(
const
std
::
vector
<
cuda
::
GpuMat
>&
value
)
{
return
pyopencv_from_generic_vec
(
value
);
}
};
CV_PY_TO_CLASS
(
cuda
::
GpuMat
);
CV_PY_TO_CLASS
(
cuda
::
Stream
);
CV_PY_TO_CLASS
(
cuda
::
Event
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment