pull/29/head
Vadim Pisarevsky 13 years ago
parent a08290d843
commit a74a2302aa
  1. 1
      modules/core/src/copy.cpp
  2. 13
      modules/core/test/test_operations.cpp

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

@ -766,6 +766,19 @@ bool CV_OperationsTest::TestTemplateMat()
Mat c = (a*b.t()).t();
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)
{

Loading…
Cancel
Save