added CUDA_DISABLER preprocessor commands

2012-10-01 22:37:20 +04:00
parent 46874d40df
commit 55b1d7c097
112 changed files with 376 additions and 81 deletions
--- a/modules/gpu/src/optical_flow_farneback.cpp
+++ b/modules/gpu/src/optical_flow_farneback.cpp
@@ -54,7 +54,7 @@ using namespace std;
 using namespace cv;
 using namespace cv::gpu;

-#if !defined(HAVE_CUDA)
+#if !defined HAVE_CUDA || defined(CUDA_DISABLER)

 void cv::gpu::FarnebackOpticalFlow::operator ()(const GpuMat&, const GpuMat&, GpuMat&, GpuMat&, Stream&) { throw_nogpu(); }