mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2024-11-26 04:00:30 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

improve error reporting in _InputArray methods

Browse Source
This commit is contained in:
Vladislav Vinogradov 2014-12-26 12:03:25 +03:00
parent e7e0da0153
commit f36546dbd2
1 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
modules/core/src/matrix.cpp
View File

@ -1527,13 +1527,15 @@ Size _InputArray::size(int i) const
return d_mat->size();
}
CV_Assert( k == CUDA_HOST_MEM );
//if( k == CUDA_HOST_MEM )
if( k == CUDA_HOST_MEM )
{
CV_Assert( i < 0 );
const cuda::HostMem* cuda_mem = (const cuda::HostMem*)obj;
return cuda_mem->size();
}
CV_Error(Error::StsNotImplemented, "Unknown/unsupported array type");
return Size();
}
int _InputArray::sizend(int* arrsz, int i) const
@ -1706,12 +1708,14 @@ int _InputArray::dims(int i) const
return 2;
}
CV_Assert( k == CUDA_HOST_MEM );
//if( k == CUDA_HOST_MEM )
if( k == CUDA_HOST_MEM )
{
CV_Assert( i < 0 );
return 2;
}
CV_Error(Error::StsNotImplemented, "Unknown/unsupported array type");
return 0;
}
size_t _InputArray::total(int i) const
@ -1802,9 +1806,11 @@ int _InputArray::type(int i) const
if( k == CUDA_GPU_MAT )
return ((const cuda::GpuMat*)obj)->type();
CV_Assert( k == CUDA_HOST_MEM );
//if( k == CUDA_HOST_MEM )
if( k == CUDA_HOST_MEM )
return ((const cuda::HostMem*)obj)->type();
CV_Error(Error::StsNotImplemented, "Unknown/unsupported array type");
return 0;
}
int _InputArray::depth(int i) const
@ -1866,9 +1872,11 @@ bool _InputArray::empty() const
if( k == CUDA_GPU_MAT )
return ((const cuda::GpuMat*)obj)->empty();
CV_Assert( k == CUDA_HOST_MEM );
//if( k == CUDA_HOST_MEM )
if( k == CUDA_HOST_MEM )
return ((const cuda::HostMem*)obj)->empty();
CV_Error(Error::StsNotImplemented, "Unknown/unsupported array type");
return true;
}
bool _InputArray::isContinuous(int i) const