From cdb7b83741fde677ebfa0923ed49f9f3706b066f Mon Sep 17 00:00:00 2001 From: Vladislav Vinogradov Date: Mon, 4 Aug 2014 12:12:51 +0400 Subject: [PATCH 1/2] fix python module compilation with enabled CUDA support: filterout all CUDA related headers from python module include headers --- modules/python/CMakeLists.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/python/CMakeLists.txt b/modules/python/CMakeLists.txt index 66ac1addd6..128f28558f 100644 --- 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") From a3da3a01e151be9beb8f28ff8ad055131aa95f90 Mon Sep 17 00:00:00 2001 From: Vladislav Vinogradov Date: Mon, 4 Aug 2014 12:13:33 +0400 Subject: [PATCH 2/2] fix test_opencv_imgproc compilation --- modules/imgproc/test/ocl/test_filters.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/imgproc/test/ocl/test_filters.cpp b/modules/imgproc/test/ocl/test_filters.cpp index aa881bd3c6..61f38a6b8b 100644 --- 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()));