Merge pull request #2253 from ilya-lavrenov:cuda

This commit is contained in:
Roman Donchenko 2014-02-03 12:12:11 +04:00 committed by OpenCV Buildbot
commit 82330a51bd

View File

@ -46,6 +46,7 @@
using namespace cv; using namespace cv;
using namespace cv::cuda; using namespace cv::cuda;
#ifdef HAVE_CUDA
namespace namespace
{ {
size_t alignUpStep(size_t what, size_t alignment) size_t alignUpStep(size_t what, size_t alignment)
@ -56,6 +57,7 @@ namespace
return res; return res;
} }
} }
#endif
void cv::cuda::CudaMem::create(int rows_, int cols_, int type_) void cv::cuda::CudaMem::create(int rows_, int cols_, int type_)
{ {