fix CUDA build

alalek · alalek · commit 164a41b399a2 · 2017-09-04T14:41:29.000+03:00
CUDA implementation wants to convert std::vector&lt;KeyPoint&gt; &lt;-&gt; GpuMat.
There is no direct mapping from KeyPoint (mix of int/float fields)
into cv::Mat element type, so this conversion must be avoided.

Legacy mode is turned back for CUDA builds.
diff --git a/cmake/OpenCVUtils.cmake b/cmake/OpenCVUtils.cmake
@@ -940,6 +940,12 @@ function(ocv_target_link_libraries target)
   endif()
 endfunction()
 
+function(ocv_target_compile_definitions target)
+  _ocv_fix_target(target)
+  target_compile_definitions(${target} ${ARGN})
+endfunction()
+
+
 function(_ocv_append_target_includes target)
   if(DEFINED OCV_TARGET_INCLUDE_DIRS_${target})
     target_include_directories(${target} PRIVATE ${OCV_TARGET_INCLUDE_DIRS_${target}})
diff --git a/modules/core/CMakeLists.txt b/modules/core/CMakeLists.txt
@@ -63,5 +63,9 @@ ocv_target_link_libraries(${the_module} LINK_PRIVATE
     "${OPENCV_HAL_LINKER_LIBS}"
 )
 
+if(HAVE_CUDA)
+  ocv_target_compile_definitions(${the_module} PUBLIC OPENCV_TRAITS_ENABLE_DEPRECATED)
+endif()
+
 ocv_add_accuracy_tests()
 ocv_add_perf_tests()
diff --git a/modules/cudaobjdetect/src/cascadeclassifier.cpp b/modules/cudaobjdetect/src/cascadeclassifier.cpp
@@ -186,7 +186,7 @@ namespace
         }
 
         BufferPool pool(stream);
-        GpuMat objectsBuf = pool.getBuffer(1, maxNumObjects_, DataType<Rect>::type);
+        GpuMat objectsBuf = pool.getBuffer(1, maxNumObjects_, traits::Type<Rect>::value);
 
         unsigned int numDetections;
         ncvSafeCall( process(image, objectsBuf, ncvMinSize, numDetections) );
@@ -220,7 +220,7 @@ namespace
         }
 
         CV_Assert( gpu_objects.rows == 1 );
-        CV_Assert( gpu_objects.type() == DataType<Rect>::type );
+        CV_Assert( gpu_objects.type() == traits::Type<Rect>::value );
 
         Rect* ptr = gpu_objects.ptr<Rect>();
         objects.assign(ptr, ptr + gpu_objects.cols);
@@ -533,7 +533,7 @@ namespace
         const float grouping_eps = 0.2f;
 
         BufferPool pool(stream);
-        GpuMat objects = pool.getBuffer(1, maxNumObjects_, DataType<Rect>::type);
+        GpuMat objects = pool.getBuffer(1, maxNumObjects_, traits::Type<Rect>::value);
 
         // used for debug
         // candidates.setTo(cv::Scalar::all(0));
@@ -625,7 +625,7 @@ namespace
         }
 
         CV_Assert( gpu_objects.rows == 1 );
-        CV_Assert( gpu_objects.type() == DataType<Rect>::type );
+        CV_Assert( gpu_objects.type() == traits::Type<Rect>::value );
 
         Rect* ptr = gpu_objects.ptr<Rect>();
         objects.assign(ptr, ptr + gpu_objects.cols);

Original file line number	Diff line number	Diff line change
`@@ -63,5 +63,9 @@ ocv_target_link_libraries(${the_module} LINK_PRIVATE`
`63`	`63`	`"${OPENCV_HAL_LINKER_LIBS}"`
`64`	`64`	`)`
`65`	`65`
	`66`	`+if(HAVE_CUDA)`
	`67`	`+ ocv_target_compile_definitions(${the_module} PUBLIC OPENCV_TRAITS_ENABLE_DEPRECATED)`
	`68`	`+endif()`
	`69`	`+`
`66`	`70`	`ocv_add_accuracy_tests()`
`67`	`71`	`ocv_add_perf_tests()`