potok/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-07-29 07:13:02 +04:00
Code Packages Releases Wiki Activity

rename CudaMem -> HostMem to better reflect its purpose

Browse Source
This commit is contained in:
Vladislav Vinogradov
2014-12-19 13:46:28 +03:00
parent 9210d8e542
commit 53862687d5
20 changed files with 173 additions and 155 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/superres/src/input_array_utility.cpp
+5 -5
View File
@@ -49,7 +49,7 @@ Mat cv::superres::arrGetMat(InputArray arr, Mat& buf)
{
switch (arr.kind())
{
case _InputArray::GPU_MAT:
case _InputArray::CUDA_GPU_MAT:
arr.getGpuMat().download(buf);
return buf;
@@ -66,7 +66,7 @@ UMat cv::superres::arrGetUMat(InputArray arr, UMat& buf)
{
switch (arr.kind())
{
case _InputArray::GPU_MAT:
case _InputArray::CUDA_GPU_MAT:
arr.getGpuMat().download(buf);
return buf;
@@ -83,7 +83,7 @@ GpuMat cv::superres::arrGetGpuMat(InputArray arr, GpuMat& buf)
{
switch (arr.kind())
{
case _InputArray::GPU_MAT:
case _InputArray::CUDA_GPU_MAT:
return arr.getGpuMat();
case _InputArray::OPENGL_BUFFER:
@@ -184,7 +184,7 @@ namespace
switch (src.kind())
{
case _InputArray::GPU_MAT:
case _InputArray::CUDA_GPU_MAT:
#ifdef HAVE_OPENCV_CUDAIMGPROC
cuda::cvtColor(src.getGpuMat(), dst.getGpuMatRef(), code, cn);
#else
@@ -218,7 +218,7 @@ namespace
switch (src.kind())
{
case _InputArray::GPU_MAT:
case _InputArray::CUDA_GPU_MAT:
src.getGpuMat().convertTo(dst.getGpuMatRef(), depth, scale);
break;