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/color.cpp
+++ b/modules/gpu/src/color.cpp
@@ -45,7 +45,7 @@
 using namespace cv;
 using namespace cv::gpu;

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

 void cv::gpu::cvtColor(const GpuMat&, GpuMat&, int, int, Stream&) { throw_nogpu(); }
 void cv::gpu::swapChannels(GpuMat&, const int[], Stream&) { throw_nogpu(); }