From 2509fa8080962256e31b178e67d1b404341eb537 Mon Sep 17 00:00:00 2001
From: Alexander Smorkalov <alexander.smorkalov@itseez.com>
Date: Thu, 19 Dec 2013 18:02:59 +0400
Subject: [PATCH] Warious fixes for case where HAVE_CUDA==OFF.

---
 modules/core/CMakeLists.txt                   |  4 ----
 modules/core/src/gpumat.cpp                   | 22 ++++++-------------
 modules/dynamicuda/CMakeLists.txt             |  2 +-
 .../include/opencv2/dynamicuda/dynamicuda.hpp | 19 ++++++++++++----
 4 files changed, 23 insertions(+), 24 deletions(-)

diff --git a/modules/core/CMakeLists.txt b/modules/core/CMakeLists.txt
index f20e32d3ab..2409ee9e94 100644
--- a/modules/core/CMakeLists.txt
+++ b/modules/core/CMakeLists.txt
@@ -1,12 +1,8 @@
 set(the_description "The Core Functionality")
 
-message(STATUS "ENABLE_DYNAMIC_CUDA ${ENABLE_DYNAMIC_CUDA}")
-
 if (ENABLE_DYNAMIC_CUDA)
-  message(STATUS "Using dynamic cuda approach")
   ocv_add_module(core PRIVATE_REQUIRED ${ZLIB_LIBRARIES})
 else()
-  message(STATUS "Link CUDA statically")
   ocv_add_module(core PRIVATE_REQUIRED ${ZLIB_LIBRARIES} ${CUDA_LIBRARIES} ${CUDA_npp_LIBRARY})
 endif()
 
diff --git a/modules/core/src/gpumat.cpp b/modules/core/src/gpumat.cpp
index 590685b747..17d46abcc7 100644
--- a/modules/core/src/gpumat.cpp
+++ b/modules/core/src/gpumat.cpp
@@ -44,7 +44,7 @@
 #include "opencv2/core/gpumat.hpp"
 #include <iostream>
 
-#if defined(HAVE_CUDA) || defined(DYNAMIC_CUDA_SUPPORT)
+#if defined(HAVE_CUDA)
     #include <cuda_runtime.h>
     #include <npp.h>
 
@@ -273,8 +273,6 @@ void cv::gpu::DeviceInfo::query() { deviceInfoFuncTable()->query(); }
 void cv::gpu::printCudaDeviceInfo(int device) { deviceInfoFuncTable()->printCudaDeviceInfo(device); }
 void cv::gpu::printShortCudaDeviceInfo(int device) { deviceInfoFuncTable()->printShortCudaDeviceInfo(device); }
 
-#ifdef HAVE_CUDA
-
 namespace cv { namespace gpu
 {
     CV_EXPORTS void copyWithMask(const cv::gpu::GpuMat&, cv::gpu::GpuMat&, const cv::gpu::GpuMat&, cudaStream_t);
@@ -286,8 +284,6 @@ namespace cv { namespace gpu
     CV_EXPORTS void setTo(cv::gpu::GpuMat&, cv::Scalar, const cv::gpu::GpuMat&);
 }}
 
-#endif
-
 //////////////////////////////// GpuMat ///////////////////////////////
 
 cv::gpu::GpuMat::GpuMat(const GpuMat& m)
@@ -707,43 +703,39 @@ void cv::gpu::GpuMat::release()
     refcount = 0;
 }
 
-#ifdef HAVE_CUDA
-
 namespace cv { namespace gpu
 {
     void convertTo(const GpuMat& src, GpuMat& dst)
     {
         gpuFuncTable()->convert(src, dst);
     }
-    
+
     void convertTo(const GpuMat& src, GpuMat& dst, double alpha, double beta, cudaStream_t stream)
     {
         gpuFuncTable()->convert(src, dst, alpha, beta, stream);
     }
-    
+
     void setTo(GpuMat& src, Scalar s, cudaStream_t stream)
     {
         gpuFuncTable()->setTo(src, s, cv::gpu::GpuMat(), stream);
     }
-    
+
     void setTo(GpuMat& src, Scalar s, const GpuMat& mask, cudaStream_t stream)
     {
-        gpuFuncTable()->setTo(src, s, mask, stream);        
+        gpuFuncTable()->setTo(src, s, mask, stream);
     }
-    
+
     void setTo(GpuMat& src, Scalar s)
     {
         setTo(src, s, 0);
     }
-    
+
     void setTo(GpuMat& src, Scalar s, const GpuMat& mask)
     {
         setTo(src, s, mask, 0);
     }
 }}
 
-#endif
-
 ////////////////////////////////////////////////////////////////////////
 // Error handling
 
diff --git a/modules/dynamicuda/CMakeLists.txt b/modules/dynamicuda/CMakeLists.txt
index def05d19bc..031b5e48d7 100644
--- a/modules/dynamicuda/CMakeLists.txt
+++ b/modules/dynamicuda/CMakeLists.txt
@@ -1,4 +1,4 @@
-if(NOT ANDROID)
+if(NOT ANDROID OR NOT HAVE_CUDA)
   ocv_module_disable(dynamicuda)
 endif()
 
diff --git a/modules/dynamicuda/include/opencv2/dynamicuda/dynamicuda.hpp b/modules/dynamicuda/include/opencv2/dynamicuda/dynamicuda.hpp
index 4f51755134..c5057ab99d 100644
--- a/modules/dynamicuda/include/opencv2/dynamicuda/dynamicuda.hpp
+++ b/modules/dynamicuda/include/opencv2/dynamicuda/dynamicuda.hpp
@@ -1,6 +1,10 @@
 #ifndef __GPUMAT_CUDA_HPP__
 #define __GPUMAT_CUDA_HPP__
 
+#ifndef HAVE_CUDA
+typedef void* cudaStream_t;
+#endif
+
 class DeviceInfoFuncTable
 {
 public:
@@ -56,7 +60,7 @@ public:
     virtual void convert(const GpuMat& src, GpuMat& dst) const = 0;
 
     // for gpu::device::setTo funcs
-    virtual void setTo(cv::gpu::GpuMat&, cv::Scalar, const cv::gpu::GpuMat&, CUstream_st*) const = 0;
+    virtual void setTo(cv::gpu::GpuMat&, cv::Scalar, const cv::gpu::GpuMat&, cudaStream_t) const = 0;
 
     virtual void mallocPitch(void** devPtr, size_t* step, size_t width, size_t height) const = 0;
     virtual void free(void* devPtr) const = 0;
@@ -96,8 +100,15 @@ public:
     bool hasEqualOrGreaterPtx(int, int) const { throw_nogpu; return false; }
     bool hasEqualOrGreaterBin(int, int) const { throw_nogpu; return false; }
 
-    void printCudaDeviceInfo(int) const { throw_nogpu; }
-    void printShortCudaDeviceInfo(int) const { throw_nogpu; }
+    void printCudaDeviceInfo(int) const
+    {
+        printf("The library is compiled without CUDA support\n");
+    }
+
+    void printShortCudaDeviceInfo(int) const
+    {
+        printf("The library is compiled without CUDA support\n");
+    }
 };
 
 class EmptyFuncTable : public GpuFuncTable
@@ -113,7 +124,7 @@ public:
     void convert(const GpuMat&, GpuMat&) const { throw_nogpu; }
     void convert(const GpuMat&, GpuMat&, double, double, cudaStream_t stream = 0) const { (void)stream; throw_nogpu; }
 
-    virtual void setTo(cv::gpu::GpuMat&, cv::Scalar, const cv::gpu::GpuMat&, CUstream_st*) const { throw_nogpu; }
+    virtual void setTo(cv::gpu::GpuMat&, cv::Scalar, const cv::gpu::GpuMat&, cudaStream_t) const { throw_nogpu; }
 
     void mallocPitch(void**, size_t*, size_t, size_t) const { throw_nogpu; }
     void free(void*) const {}