From 95ebdf4069a6333c14e4a610acc37e11cc90a0da Mon Sep 17 00:00:00 2001 From: Vladislav Vinogradov Date: Thu, 7 Nov 2013 12:16:06 +0400 Subject: [PATCH] fixed compilation with CUDA 6.0: GpuMat::setTo function, removed NPP call for CV_8S --- modules/core/src/gpumat.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/core/src/gpumat.cpp b/modules/core/src/gpumat.cpp index ff459f9a61..4c4af61c47 100644 --- a/modules/core/src/gpumat.cpp +++ b/modules/core/src/gpumat.cpp @@ -1361,7 +1361,7 @@ namespace static const func_t funcs[7][4] = { {NppSet::call, cv::gpu::setTo , cv::gpu::setTo , NppSet::call}, - {NppSet::call, NppSet::call, NppSet::call, NppSet::call}, + {cv::gpu::setTo , cv::gpu::setTo , cv::gpu::setTo , cv::gpu::setTo }, {NppSet::call, NppSet::call, cv::gpu::setTo , NppSet::call}, {NppSet::call, NppSet::call, cv::gpu::setTo , NppSet::call}, {NppSet::call, cv::gpu::setTo , cv::gpu::setTo , NppSet::call},