Commit 1dccf574 authored by Roman Donchenko's avatar Roman Donchenko Committed by OpenCV Buildbot

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

parents eff6dccb 4b983679
...@@ -173,7 +173,7 @@ void cv::gpu::gemm(InputArray _src1, InputArray _src2, double alpha, InputArray ...@@ -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 ...@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment