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

Merge pull request #3531 from jet47:cuda-core-refactoring

Browse Source
This commit is contained in:
Vadim Pisarevsky
2014-12-26 12:12:42 +00:00
parent f85838087a f36546dbd2
commit 0ff67253f7
30 changed files with 487 additions and 441 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
modules/cudaimgproc/src/histogram.cpp
View File

@@ -467,14 +467,14 @@ void cv::cuda::evenLevels(OutputArray _levels, int nLevels, int lowerLevel, int
_levels.create(1, nLevels, CV_32SC1);
Mat host_levels;
if (kind == _InputArray::GPU_MAT)
if (kind == _InputArray::CUDA_GPU_MAT)
host_levels.create(1, nLevels, CV_32SC1);
else
host_levels = _levels.getMat();
nppSafeCall( nppiEvenLevelsHost_32s(host_levels.ptr<Npp32s>(), nLevels, lowerLevel, upperLevel) );
if (kind == _InputArray::GPU_MAT)
if (kind == _InputArray::CUDA_GPU_MAT)
_levels.getGpuMatRef().upload(host_levels);
}