generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests 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

2
modules/superres/src/btv_l1_cuda.cpp
View File

@@ -514,7 +514,7 @@ namespace
++outPos_;
const GpuMat& curOutput = at(outPos_, outputs_);
if (_output.kind() == _InputArray::GPU_MAT)
if (_output.kind() == _InputArray::CUDA_GPU_MAT)
curOutput.convertTo(_output.getGpuMatRef(), CV_8U);
else
{

4
modules/superres/src/frame_source.cpp
View File

@@ -116,7 +116,7 @@ namespace
{
if (_frame.kind() == _InputArray::MAT)
vc_ >> _frame.getMatRef();
else if(_frame.kind() == _InputArray::GPU_MAT)
else if(_frame.kind() == _InputArray::CUDA_GPU_MAT)
{
vc_ >> frame_;
arrCopy(frame_, _frame);
@@ -226,7 +226,7 @@ namespace
void VideoFrameSource_CUDA::nextFrame(OutputArray _frame)
{
if (_frame.kind() == _InputArray::GPU_MAT)
if (_frame.kind() == _InputArray::CUDA_GPU_MAT)
{
bool res = reader_->nextFrame(_frame.getGpuMatRef());
if (!res)

10
modules/superres/src/input_array_utility.cpp
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;

2
modules/superres/src/optical_flow.cpp
View File

@@ -458,7 +458,7 @@ namespace
GpuMat input0 = convertToType(frame0, work_type_, buf_[2], buf_[3]);
GpuMat input1 = convertToType(frame1, work_type_, buf_[4], buf_[5]);
if (_flow2.needed() && _flow1.kind() == _InputArray::GPU_MAT && _flow2.kind() == _InputArray::GPU_MAT)
if (_flow2.needed() && _flow1.kind() == _InputArray::CUDA_GPU_MAT && _flow2.kind() == _InputArray::CUDA_GPU_MAT)
{
impl(input0, input1, _flow1.getGpuMatRef(), _flow2.getGpuMatRef());
return;