From 8f6695acc7e3d8dd8648c12a1858b52c5246518b Mon Sep 17 00:00:00 2001
From: Alexander Alekhin <alexander.a.alekhin@gmail.com>
Date: Sun, 2 Sep 2018 03:31:05 +0000
Subject: [PATCH 1/2] CUDA: drop OPENCV_TRAITS_ENABLE_DEPRECATED requirement

---
 modules/core/CMakeLists.txt | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/modules/core/CMakeLists.txt b/modules/core/CMakeLists.txt
index 73acbdd022..1306c3d9dc 100644
--- a/modules/core/CMakeLists.txt
+++ b/modules/core/CMakeLists.txt
@@ -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()
 

From 5f17cc1abdd71fe7c7b9e874cee6e6bceb7ebc85 Mon Sep 17 00:00:00 2001
From: Hamdi Sahloul <hamdisahloul@hotmail.com>
Date: Fri, 28 Sep 2018 08:58:30 +0900
Subject: [PATCH 2/2] Fix Python wrapper for GpuMat

---
 .../python/{pyopencv_core.hpp => pyopencv_cuda.hpp} | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 rename modules/core/misc/python/{pyopencv_core.hpp => pyopencv_cuda.hpp} (64%)

diff --git a/modules/core/misc/python/pyopencv_core.hpp b/modules/core/misc/python/pyopencv_cuda.hpp
similarity index 64%
rename from modules/core/misc/python/pyopencv_core.hpp
rename to modules/core/misc/python/pyopencv_cuda.hpp
index 8f7abb08da..62d2397b90 100644
--- a/modules/core/misc/python/pyopencv_core.hpp
+++ b/modules/core/misc/python/pyopencv_cuda.hpp
@@ -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);