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

Merge pull request #1987 from pentschev:cv_completesymm_template_2.4

Browse Source
This commit is contained in:
Roman Donchenko 2013-12-17 13:17:25 +04:00 committed by OpenCV Buildbot
commit 5d5527d03e
1 changed files with 11 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2032,39 +2032,24 @@ void cv::transpose( InputArray _src, OutputArray _dst )
} }
////////////////////////////////////// completeSymm /////////////////////////////////////////
void cv::completeSymm( InputOutputArray _m, bool LtoR ) void cv::completeSymm( InputOutputArray _m, bool LtoR )
{ {
Mat m = _m.getMat(); Mat m = _m.getMat();
CV_Assert( m.dims <= 2 ); size_t step = m.step, esz = m.elemSize();
CV_Assert( m.dims <= 2 && m.rows == m.cols );
int i, j, nrows = m.rows, type = m.type(); int rows = m.rows;
int j0 = 0, j1 = nrows; int j0 = 0, j1 = rows;
CV_Assert( m.rows == m.cols );
if( type == CV_32FC1 || type == CV_32SC1 ) uchar* data = m.data;
for( int i = 0; i < rows; i++ )
{ {
int* data = (int*)m.data; if( !LtoR ) j1 = i; else j0 = i+1;
size_t step = m.step/sizeof(data[0]); for( int j = j0; j < j1; j++ )
for( i = 0; i < nrows; i++ ) memcpy(data + (i*step + j*esz), data + (j*step + i*esz), esz);
{
if( !LtoR ) j1 = i; else j0 = i+1;
for( j = j0; j < j1; j++ )
data[i*step + j] = data[j*step + i];
}
} }
else if( type == CV_64FC1 )
{
double* data = (double*)m.data;
size_t step = m.step/sizeof(data[0]);
for( i = 0; i < nrows; i++ )
{
if( !LtoR ) j1 = i; else j0 = i+1;
for( j = j0; j < j1; j++ )
data[i*step + j] = data[j*step + i];
}
}
else
CV_Error( CV_StsUnsupportedFormat, "" );
} }