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

fixed bug #2331

Browse Source
This commit is contained in:
Vadim Pisarevsky 2012-09-04 13:34:52 +04:00
parent a08290d843
commit a74a2302aa
2 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -209,6 +209,7 @@ void Mat::copyTo( OutputArray _dst ) const
int dtype = _dst.type(); int dtype = _dst.type();
if( _dst.fixedType() && dtype != type() ) if( _dst.fixedType() && dtype != type() )
{ {
CV_Assert( channels() == CV_MAT_CN(dtype) );
convertTo( _dst, dtype ); convertTo( _dst, dtype );
return; return;
} }

13
modules/core/test/test_operations.cpp
View File

@ -766,6 +766,19 @@ bool CV_OperationsTest::TestTemplateMat()
Mat c = (a*b.t()).t(); Mat c = (a*b.t()).t();
CV_Assert( norm(c, CV_L1) == 4. ); CV_Assert( norm(c, CV_L1) == 4. );
} }
bool badarg_catched = false;
try
{
Mat m1 = Mat::zeros(1, 10, CV_8UC1);
Mat m2 = Mat::zeros(10, 10, CV_8UC3);
m1.copyTo(m2.row(1));
}
catch(const Exception& e)
{
badarg_catched = true;
}
CV_Assert( badarg_catched );
} }
catch (const test_excep& e) catch (const test_excep& e)
{ {