generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Move cv::Mat out of core.hpp

Browse Source
This commit is contained in:
Andrey Kamaev
2013-03-28 21:01:12 +04:00
parent 135c0b6cb5
commit 715fa3303e
46 changed files with 1854 additions and 1731 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
modules/highgui/src/cap.cpp
View File

@@ -495,10 +495,10 @@ bool VideoCapture::retrieve(Mat& image, int channel)
return false;
}
if(_img->origin == IPL_ORIGIN_TL)
image = Mat(_img);
image = cv::cvarrToMat(_img);
else
{
Mat temp(_img);
Mat temp = cv::cvarrToMat(_img);
flip(temp, image, 0);
}
return true;

2
modules/highgui/src/window_QT.cpp
View File

@@ -948,7 +948,7 @@ void GuiReceiver::showImage(QString name, void* arr)
mat = cvGetMat(arr, &stub);
cv::Mat im(mat);
cv::Mat im = cv::cvarrToMat(mat);
cv::imshow(name.toUtf8().data(), im);
}
else

4
modules/highgui/test/test_video_io.cpp
View File

@@ -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)