Merge pull request #2253 from ilya-lavrenov:cuda

82330a51 · Roman Donchenko · OpenCV Buildbot · c9670699 · a6104bd0 · 82330a51
Commit 82330a51 authored Feb 03, 2014 by Roman Donchenko Committed by OpenCV Buildbot Feb 03, 2014
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 0 deletions

cuda_host_mem.cpp modules/core/src/cuda_host_mem.cpp +2 -0

No files found.
--- a/modules/core/src/cuda_host_mem.cpp
+++ b/modules/core/src/cuda_host_mem.cpp
@@ -46,6 +46,7 @@
 using namespace cv;
 using namespace cv::cuda;

+#ifdef HAVE_CUDA
 namespace
 {
    size_t alignUpStep(size_t what, size_t alignment)
@@ -56,6 +57,7 @@ namespace
        return res;
    }
 }
+#endif

 void cv::cuda::CudaMem::create(int rows_, int cols_, int type_)
 {