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

Merge pull request #1024 from jet47:fix-gpuarithm-compilation

Browse Source
This commit is contained in:
Roman Donchenko 2013-06-25 14:38:17 +04:00 committed by OpenCV Buildbot
commit 1dccf5743e
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
modules/gpuarithm/src/arithm.cpp
View File

@ -173,7 +173,7 @@ void cv::gpu::gemm(InputArray _src1, InputArray _src2, double alpha, InputArray
(void) _dst; (void) _dst;
(void) flags; (void) flags;
(void) stream; (void) stream;
CV_Error(:Error::StsNotImplemented, "The library was build without CUBLAS"); CV_Error(Error::StsNotImplemented, "The library was build without CUBLAS");
#else #else
// CUBLAS works with column-major matrices // CUBLAS works with column-major matrices
@ -624,10 +624,10 @@ namespace
Ptr<Convolution> cv::gpu::createConvolution(Size user_block_size) Ptr<Convolution> cv::gpu::createConvolution(Size user_block_size)
{ {
#ifndef HAVE_CUBLAS #ifndef HAVE_CUFFT
(void) user_block_size; (void) user_block_size;
CV_Error(cv::Error::StsNotImplemented, "The library was build without CUFFT"); CV_Error(Error::StsNotImplemented, "The library was build without CUFFT");
return Ptr<BLAS>(); return Ptr<Convolution>();
#else #else
return new ConvolutionImpl(user_block_size); return new ConvolutionImpl(user_block_size);
#endif #endif