Removed incorrectly merged test

13 years ago · 5715d9ef42
parent ab69f5e091
commit 5715d9ef42
1 changed files with 172 additions and 181 deletions
--- a/modules/core/test/test_operations.cpp
+++ b/modules/core/test/test_operations.cpp
@ -751,15 +751,6 @@ bool CV_OperationsTest::TestTemplateMat()
        if (Mat3w(1, 1).channels() != 3) throw test_excep();
        if (Mat3s(1, 1).channels() != 3) throw test_excep();

-        vector<Mat_<float> > mvf, mvf2;
-        Mat_<Vec2f> mf2;
-        mvf.push_back(Mat_<float>::ones(4, 3));
-        mvf.push_back(Mat_<float>::zeros(4, 3));
-        merge(mvf, mf2);
-        split(mf2, mvf2);
-        CV_Assert( norm(mvf2[0], mvf[0], CV_C) == 0 &&
-                  norm(mvf2[1], mvf[1], CV_C) == 0 );
-        
        {
            Mat a(2,2,CV_32F,1.f);
            Mat b(1,2,CV_32F,1.f);