Move cv::Mat out of core.hpp

2013-03-28 21:01:12 +04:00
parent 135c0b6cb5
commit 715fa3303e
46 changed files with 1854 additions and 1731 deletions
--- a/modules/highgui/test/test_video_io.cpp
+++ b/modules/highgui/test/test_video_io.cpp
@@ -247,7 +247,7 @@ void CV_HighGuiTest::VideoTest(const string& dir, const cvtest::VideoFormat& fmt
        if (!img)
            break;

-        frames.push_back(Mat(img).clone());
+        frames.push_back(cv::cvarrToMat(img, true));

        if (writer == 0)
        {
@@ -285,7 +285,7 @@ void CV_HighGuiTest::VideoTest(const string& dir, const cvtest::VideoFormat& fmt
            break;

        Mat img = frames[i];
-        Mat img1(ipl1);
+        Mat img1 = cv::cvarrToMat(ipl1);

        double psnr = PSNR(img1, img);
        if (psnr < thresDbell)