generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix compilation without CUDA

Browse Source
This commit is contained in:
Vladislav Vinogradov
2014-12-24 17:23:54 +03:00
parent cd0e95de16
commit b4e7ee46c6
2 changed files with 32 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
modules/core/include/opencv2/core/private.cuda.hpp
View File

@@ -80,6 +80,16 @@
namespace cv { namespace cuda {
CV_EXPORTS cv::String getNppErrorMessage(int code);
CV_EXPORTS cv::String getCudaDriverApiErrorMessage(int code);
CV_EXPORTS GpuMat getInputMat(InputArray _src, Stream& stream);
CV_EXPORTS GpuMat getOutputMat(OutputArray _dst, int rows, int cols, int type, Stream& stream);
static inline GpuMat getOutputMat(OutputArray _dst, Size size, int type, Stream& stream)
{
return getOutputMat(_dst, size.height, size.width, type, stream);
}
CV_EXPORTS void syncOutput(const GpuMat& dst, OutputArray _dst, Stream& stream);
}}
#ifndef HAVE_CUDA
@@ -106,16 +116,6 @@ namespace cv { namespace cuda
GpuMat::Allocator* allocator_;
};
CV_EXPORTS GpuMat getInputMat(InputArray _src, Stream& stream);
CV_EXPORTS GpuMat getOutputMat(OutputArray _dst, int rows, int cols, int type, Stream& stream);
static inline GpuMat getOutputMat(OutputArray _dst, Size size, int type, Stream& stream)
{
return getOutputMat(_dst, size.height, size.width, type, stream);
}
CV_EXPORTS void syncOutput(const GpuMat& dst, OutputArray _dst, Stream& stream);
static inline void checkNppError(int code, const char* file, const int line, const char* func)
{
if (code < 0)