Move cv::Mat out of core.hpp
This commit is contained in:
@@ -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;
|
||||
|
@@ -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
|
||||
|
@@ -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)
|
||||
|
Reference in New Issue
Block a user