potok/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-07-31 08:13:04 +04:00
Code Packages Releases Wiki Activity

Merge pull request #12678 from cv3d:cleanup/python/enums

Browse Source
This commit is contained in:
Alexander Alekhin
2018-09-28 16:07:21 +00:00
parent 2c6ab65476 e104fcc000
commit 83efde6243
8 changed files with 31 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/core/misc/python/pyopencv_core.hpp
-6
View File
@@ -15,16 +15,10 @@ CV_PY_TO_CLASS(cuda::HostMem);
CV_PY_TO_CLASS_PTR(cuda::GpuMat);
CV_PY_TO_CLASS_PTR(cuda::GpuMat::Allocator);
CV_PY_TO_ENUM(cuda::Event::CreateFlags);
CV_PY_TO_ENUM(cuda::HostMem::AllocType);
CV_PY_TO_ENUM(cuda::FeatureSet);
CV_PY_FROM_CLASS(cuda::GpuMat);
CV_PY_FROM_CLASS(cuda::Stream);
CV_PY_FROM_CLASS(cuda::HostMem);
CV_PY_FROM_CLASS_PTR(cuda::GpuMat::Allocator);
CV_PY_FROM_ENUM(cuda::DeviceInfo::ComputeMode);
#endif
modules/core/misc/python/pyopencv_umat.hpp
-3
View File
@@ -6,9 +6,6 @@ typedef std::vector<Range> vector_Range;
CV_PY_TO_CLASS(UMat);
CV_PY_FROM_CLASS(UMat);
CV_PY_TO_ENUM(UMatUsageFlags);
CV_PY_FROM_ENUM(AccessFlag);
CV_PY_TO_ENUM(AccessFlag);
static bool cv_mappable_to(const Ptr<Mat>& src, Ptr<UMat>& dst)
{