From f708a11f0f5160c4f277daea526c7ec039c76505 Mon Sep 17 00:00:00 2001 From: Alexander Alekhin Date: Thu, 26 Apr 2018 14:13:01 +0300 Subject: [PATCH] build: fix warnings --- modules/core/src/cuda_gpu_mat.cpp | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/modules/core/src/cuda_gpu_mat.cpp b/modules/core/src/cuda_gpu_mat.cpp index 8215dd0694..9514ec2037 100644 --- a/modules/core/src/cuda_gpu_mat.cpp +++ b/modules/core/src/cuda_gpu_mat.cpp @@ -344,13 +344,12 @@ void cv::cuda::ensureSizeIsEnough(int rows, int cols, int type, OutputArray arr) GpuMat cv::cuda::getInputMat(InputArray _src, Stream& stream) { - GpuMat src; - #ifndef HAVE_CUDA (void) _src; (void) stream; throw_no_cuda(); #else + GpuMat src; if (_src.kind() == _InputArray::CUDA_GPU_MAT) { src = _src.getGpuMat(); @@ -361,15 +360,12 @@ GpuMat cv::cuda::getInputMat(InputArray _src, Stream& stream) src = pool.getBuffer(_src.size(), _src.type()); src.upload(_src, stream); } -#endif - return src; +#endif } GpuMat cv::cuda::getOutputMat(OutputArray _dst, int rows, int cols, int type, Stream& stream) { - GpuMat dst; - #ifndef HAVE_CUDA (void) _dst; (void) rows; @@ -378,6 +374,7 @@ GpuMat cv::cuda::getOutputMat(OutputArray _dst, int rows, int cols, int type, St (void) stream; throw_no_cuda(); #else + GpuMat dst; if (_dst.kind() == _InputArray::CUDA_GPU_MAT) { _dst.create(rows, cols, type); @@ -388,9 +385,8 @@ GpuMat cv::cuda::getOutputMat(OutputArray _dst, int rows, int cols, int type, St BufferPool pool(stream); dst = pool.getBuffer(rows, cols, type); } -#endif - return dst; +#endif } void cv::cuda::syncOutput(const GpuMat& dst, OutputArray _dst, Stream& stream)