Merge pull request #3034 from jet47:fix-compilation

11 years ago · dbedc63c55
parent add9ce46c3 a3da3a01e1
commit dbedc63c55
2 changed files with 3 additions and 2 deletions
--- a/modules/imgproc/test/ocl/test_filters.cpp
+++ b/modules/imgproc/test/ocl/test_filters.cpp
@ -432,7 +432,7 @@ OCL_INSTANTIATE_TEST_CASE_P(Filter, Dilate, Combine(
 OCL_INSTANTIATE_TEST_CASE_P(Filter, MorphologyEx, Combine(
                            Values(CV_8UC1, CV_8UC3, CV_8UC4, CV_32FC1, CV_32FC3, CV_32FC4),
                            Values(3, 5, 7), // kernel size
-                            Values(MORPH_OPEN, MORPH_CLOSE, MORPH_GRADIENT, MORPH_TOPHAT, MORPH_BLACKHAT), // used as generator of operations
+                            Values((MorphOp)MORPH_OPEN, (MorphOp)MORPH_CLOSE, (MorphOp)MORPH_GRADIENT, (MorphOp)MORPH_TOPHAT, (MorphOp)MORPH_BLACKHAT), // used as generator of operations
                            Values(1, 2, 3),
                            Bool()));

--- a/modules/python/CMakeLists.txt
+++ b/modules/python/CMakeLists.txt
@ -45,7 +45,8 @@ endforeach(m)

 # header blacklist
 ocv_list_filterout(opencv_hdrs ".h$")
-ocv_list_filterout(opencv_hdrs "opencv2/core/cuda")
+ocv_list_filterout(opencv_hdrs "cuda")
+ocv_list_filterout(opencv_hdrs "cudev")
 ocv_list_filterout(opencv_hdrs "opencv2/objdetect/detection_based_tracker.hpp")
 ocv_list_filterout(opencv_hdrs "opencv2/optim.hpp")