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

fixed OutputArray::create, which resolves several failures in opencv_test_core

Browse Source
This commit is contained in:
Vadim Pisarevsky 2011-04-18 16:32:43 +00:00
parent 94e09f24c7
commit dd45fe13d1
1 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1188,11 +1188,15 @@ void OutputArray::create(int dims, const int* size, int type, int i, bool alloca
{
CV_Assert( i < 0 );
Mat& m = *(Mat*)obj;
if( allocateVector && dims == 2 && m.dims == 2 &&
m.type() == type && m.rows == size[1] && m.cols == size[0] && m.isContinuous())
return;
if( !m.isContinuous() )
m.release();
if( allocateVector )
{
if( !m.isContinuous() )
m.release();
if( dims == 2 && m.dims == 2 && m.data &&
m.type() == type && m.rows == size[1] && m.cols == size[0] )
return;
}
m.create(dims, size, type);
return;
}
@ -1310,11 +1314,15 @@ void OutputArray::create(int dims, const int* size, int type, int i, bool alloca
CV_Assert( i < (int)v.size() );
Mat& m = v[i];
if( allocateVector && dims == 2 && m.dims == 2 &&
m.type() == type && m.rows == size[1] && m.cols == size[0] && m.isContinuous())
return;
if(!m.isContinuous())
m.release();
if( allocateVector )
{
if( !m.isContinuous() )
m.release();
if( dims == 2 && m.dims == 2 && m.data &&
m.type() == type && m.rows == size[1] && m.cols == size[0] )
return;
}
m.create(dims, size, type);
}
}