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

fixed clone of empty matrix

Browse Source
This commit is contained in:
Ilya Lavrenov 2016-07-14 16:36:57 +03:00
parent ce05d6cb89
commit 87ae4e0564
5 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -115,12 +115,13 @@ cvCreateMatHeader( int rows, int cols, int type )
{ {
type = CV_MAT_TYPE(type); type = CV_MAT_TYPE(type);
if( rows < 0 || cols <= 0 ) if( rows < 0 || cols < 0 )
CV_Error( CV_StsBadSize, "Non-positive width or height" ); CV_Error( CV_StsBadSize, "Non-positive width or height" );
int min_step = CV_ELEM_SIZE(type)*cols; int min_step = CV_ELEM_SIZE(type);
if( min_step <= 0 ) if( min_step <= 0 )
CV_Error( CV_StsUnsupportedFormat, "Invalid matrix type" ); CV_Error( CV_StsUnsupportedFormat, "Invalid matrix type" );
min_step *= cols;
CvMat* arr = (CvMat*)cvAlloc( sizeof(*arr)); CvMat* arr = (CvMat*)cvAlloc( sizeof(*arr));
@ -148,7 +149,7 @@ cvInitMatHeader( CvMat* arr, int rows, int cols,
if( (unsigned)CV_MAT_DEPTH(type) > CV_DEPTH_MAX ) if( (unsigned)CV_MAT_DEPTH(type) > CV_DEPTH_MAX )
CV_Error( CV_BadNumChannels, "" ); CV_Error( CV_BadNumChannels, "" );
if( rows < 0 || cols <= 0 ) if( rows < 0 || cols < 0 )
CV_Error( CV_StsBadSize, "Non-positive cols or rows" ); CV_Error( CV_StsBadSize, "Non-positive cols or rows" );
type = CV_MAT_TYPE( type ); type = CV_MAT_TYPE( type );

6
modules/core/src/copy.cpp
View File

@ -259,12 +259,6 @@ void Mat::copyTo( OutputArray _dst ) const
return; return;
} }
if( empty() )
{
_dst.release();
return;
}
if( _dst.isUMat() ) if( _dst.isUMat() )
{ {
_dst.create( dims, size.p, type() ); _dst.create( dims, size.p, type() );

2
modules/core/src/persistence.cpp
View File

@ -3909,8 +3909,6 @@ icvReadMat( CvFileStorage* fs, CvFileNode* node )
mat = cvCreateMat( rows, cols, elem_type ); mat = cvCreateMat( rows, cols, elem_type );
cvReadRawData( fs, data, mat->data.ptr, dt ); cvReadRawData( fs, data, mat->data.ptr, dt );
} }
else if( rows == 0 && cols == 0 )
mat = cvCreateMatHeader( 0, 1, elem_type );
else else
mat = cvCreateMatHeader( rows, cols, elem_type ); mat = cvCreateMatHeader( rows, cols, elem_type );

1
modules/core/test/test_io.cpp
View File

@ -706,7 +706,6 @@ protected:
EXPECT_EQ(_em_in.rows , _em_out.rows); EXPECT_EQ(_em_in.rows , _em_out.rows);
EXPECT_EQ(_em_in.cols , _em_out.cols); EXPECT_EQ(_em_in.cols , _em_out.cols);
EXPECT_EQ(_em_in.dims , _em_out.dims);
EXPECT_EQ(_em_in.depth(), _em_out.depth()); EXPECT_EQ(_em_in.depth(), _em_out.depth());
EXPECT_TRUE(_em_in.empty()); EXPECT_TRUE(_em_in.empty());

8
modules/core/test/test_mat.cpp
View File

@ -1538,3 +1538,11 @@ TEST(Mat, push_back_vector)
ASSERT_EQ(6, result.rows); ASSERT_EQ(6, result.rows);
} }
TEST(Mat, regression_5917_clone_empty)
{
Mat cloned;
Mat_<Point2f> source(5, 0);
ASSERT_NO_THROW(cloned = source.clone());
}