Commit 87f6e500 authored by Vadim Pisarevsky's avatar Vadim Pisarevsky

united cv::Mat and cv::MatND

parent 3e9e2f09
...@@ -65,7 +65,6 @@ protected: ...@@ -65,7 +65,6 @@ protected:
bool checkMatSetError(const Mat& m1, const Mat& m2); bool checkMatSetError(const Mat& m1, const Mat& m2);
bool checkMatSetError(const MatND& m1, const MatND& m2);
}; };
CV_MatrOpTest::CV_MatrOpTest(): CvTest( "matrix-operations", "?" ) CV_MatrOpTest::CV_MatrOpTest(): CvTest( "matrix-operations", "?" )
...@@ -83,15 +82,6 @@ bool CV_MatrOpTest::checkMatSetError(const Mat& m1, const Mat& m2) ...@@ -83,15 +82,6 @@ bool CV_MatrOpTest::checkMatSetError(const Mat& m1, const Mat& m2)
return false; 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() bool CV_MatrOpTest::TestMat()
{ {
Mat one_3x1(3, 1, CV_32F, Scalar(1.0)); Mat one_3x1(3, 1, CV_32F, Scalar(1.0));
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment