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

Merge pull request #3775 from Dmitry-Me:reduceVariableScope5

Browse Source
This commit is contained in:
Vadim Pisarevsky 2015-03-03 12:29:18 +00:00
commit f38339c089
1 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -504,7 +504,7 @@ cvInitNArrayIterator( int count, CvArr** arrs,
CV_IMPL int cvNextNArraySlice( CvNArrayIterator* iterator ) CV_IMPL int cvNextNArraySlice( CvNArrayIterator* iterator )
{ {
assert( iterator != 0 ); assert( iterator != 0 );
int i, dims, size = 0; int i, dims;
for( dims = iterator->dims; dims > 0; dims-- ) for( dims = iterator->dims; dims > 0; dims-- )
{ {
@ -514,7 +514,7 @@ CV_IMPL int cvNextNArraySlice( CvNArrayIterator* iterator )
if( --iterator->stack[dims-1] > 0 ) if( --iterator->stack[dims-1] > 0 )
break; break;
size = iterator->hdr[0]->dim[dims-1].size; const int size = iterator->hdr[0]->dim[dims-1].size;
for( i = 0; i < iterator->count; i++ ) for( i = 0; i < iterator->count; i++ )
iterator->ptr[i] -= (size_t)size*iterator->hdr[i]->dim[dims-1].step; iterator->ptr[i] -= (size_t)size*iterator->hdr[i]->dim[dims-1].step;
@ -856,7 +856,6 @@ cvCreateData( CvArr* arr )
else if( CV_IS_MATND_HDR( arr )) else if( CV_IS_MATND_HDR( arr ))
{ {
CvMatND* mat = (CvMatND*)arr; CvMatND* mat = (CvMatND*)arr;
int i;
size_t total_size = CV_ELEM_SIZE(mat->type); size_t total_size = CV_ELEM_SIZE(mat->type);
if( mat->dim[0].size == 0 ) if( mat->dim[0].size == 0 )
@ -872,6 +871,7 @@ cvCreateData( CvArr* arr )
} }
else else
{ {
int i;
for( i = mat->dims - 1; i >= 0; i-- ) for( i = mat->dims - 1; i >= 0; i-- )
{ {
size_t size = (size_t)mat->dim[i].step*mat->dim[i].size; size_t size = (size_t)mat->dim[i].step*mat->dim[i].size;
@ -1055,16 +1055,19 @@ cvGetRawData( const CvArr* arr, uchar** data, int* step, CvSize* roi_size )
if( roi_size || step ) if( roi_size || step )
{ {
int i, size1 = mat->dim[0].size, size2 = 1; if( roi_size )
{
int size1 = mat->dim[0].size, size2 = 1;
if( mat->dims > 2 ) if( mat->dims > 2 )
{
int i;
for( i = 1; i < mat->dims; i++ ) for( i = 1; i < mat->dims; i++ )
size1 *= mat->dim[i].size; size1 *= mat->dim[i].size;
}
else else
size2 = mat->dim[1].size; size2 = mat->dim[1].size;
if( roi_size )
{
roi_size->width = size2; roi_size->width = size2;
roi_size->height = size1; roi_size->height = size1;
} }
@ -2458,7 +2461,6 @@ cvGetMat( const CvArr* array, CvMat* mat,
else if( allowND && CV_IS_MATND_HDR(src) ) else if( allowND && CV_IS_MATND_HDR(src) )
{ {
CvMatND* matnd = (CvMatND*)src; CvMatND* matnd = (CvMatND*)src;
int i;
int size1 = matnd->dim[0].size, size2 = 1; int size1 = matnd->dim[0].size, size2 = 1;
if( !src->data.ptr ) if( !src->data.ptr )
@ -2468,8 +2470,11 @@ cvGetMat( const CvArr* array, CvMat* mat,
CV_Error( CV_StsBadArg, "Only continuous nD arrays are supported here" ); CV_Error( CV_StsBadArg, "Only continuous nD arrays are supported here" );
if( matnd->dims > 2 ) if( matnd->dims > 2 )
{
int i;
for( i = 1; i < matnd->dims; i++ ) for( i = 1; i < matnd->dims; i++ )
size2 *= matnd->dim[i].size; size2 *= matnd->dim[i].size;
}
else else
size2 = matnd->dims == 1 ? 1 : matnd->dim[1].size; size2 = matnd->dims == 1 ? 1 : matnd->dim[1].size;
@ -2785,7 +2790,6 @@ cvGetImage( const CvArr* array, IplImage* img )
{ {
IplImage* result = 0; IplImage* result = 0;
const IplImage* src = (const IplImage*)array; const IplImage* src = (const IplImage*)array;
int depth;
if( !img ) if( !img )
CV_Error( CV_StsNullPtr, "" ); CV_Error( CV_StsNullPtr, "" );
@ -2800,7 +2804,7 @@ cvGetImage( const CvArr* array, IplImage* img )
if( mat->data.ptr == 0 ) if( mat->data.ptr == 0 )
CV_Error( CV_StsNullPtr, "" ); CV_Error( CV_StsNullPtr, "" );
depth = cvIplDepth(mat->type); int depth = cvIplDepth(mat->type);
cvInitImageHeader( img, cvSize(mat->cols, mat->rows), cvInitImageHeader( img, cvSize(mat->cols, mat->rows),
depth, CV_MAT_CN(mat->type) ); depth, CV_MAT_CN(mat->type) );