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

Merge pull request #2065 from ilya-lavrenov:tapi_calcBackProject

Browse Source
This commit is contained in:
Andrey Pavlenko
2013-12-26 20:37:33 +04:00
committed by OpenCV Buildbot
parent fd6a74496b b23edc34e9
commit 4644a864a5
4 changed files with 475 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1430,6 +1430,16 @@ Size _InputArray::size(int i) const
return vv[i].size();
}
if( k == STD_VECTOR_UMAT )
{
const std::vector<UMat>& vv = *(const std::vector<UMat>*)obj;
if( i < 0 )
return vv.empty() ? Size() : Size((int)vv.size(), 1);
CV_Assert( i < (int)vv.size() );
return vv[i].size();
}
if( k == OPENGL_BUFFER )
{
CV_Assert( i < 0 );
@@ -2262,6 +2272,12 @@ void _OutputArray::release() const
return;
}
if( k == UMAT )
{
((UMat*)obj)->release();
return;
}
if( k == GPU_MAT )
{
((cuda::GpuMat*)obj)->release();
@@ -2301,6 +2317,12 @@ void _OutputArray::release() const
return;
}
if( k == STD_VECTOR_UMAT )
{
((std::vector<UMat>*)obj)->clear();
return;
}
CV_Error(Error::StsNotImplemented, "Unknown/unsupported array type");
}