Move cv::Mat out of core.hpp

modules/highgui/src/cap.cpp

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

modules/highgui/src/window_QT.cpp

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