united cv::Mat and cv::MatND

This commit is contained in:
Vadim Pisarevsky 2010-10-12 12:33:16 +00:00
parent 3e9e2f0958
commit 87f6e500e1

View File

@ -65,7 +65,6 @@ protected:
bool checkMatSetError(const Mat& m1, const Mat& m2);
bool checkMatSetError(const MatND& m1, const MatND& m2);
};
CV_MatrOpTest::CV_MatrOpTest(): CvTest( "matrix-operations", "?" )
@ -83,15 +82,6 @@ bool CV_MatrOpTest::checkMatSetError(const Mat& m1, const Mat& m2)
return false;
}
bool CV_MatrOpTest::checkMatSetError(const MatND& m1, const MatND& m2)
{
if (norm(m1, m2, NORM_INF) == 0)
return true;
ts->set_failed_test_info(CvTS::FAIL_MISMATCH);
return false;
}
bool CV_MatrOpTest::TestMat()
{
Mat one_3x1(3, 1, CV_32F, Scalar(1.0));