potok/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-07-29 23:33:05 +04:00
Code Packages Releases Wiki Activity

Merge remote-tracking branch 'upstream/3.4' into merge-3.4

Browse Source
This commit is contained in:
Alexander Alekhin
2018-09-10 00:04:29 +03:00
parent 80610ca054 c35c5a47df
commit dca657a2fd
107 changed files with 492 additions and 485 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/highgui/src/window.cpp
+4 -4
View File
@@ -366,7 +366,7 @@ void cv::imshow( const String& winname, InputArray _img )
if (useGl <= 0)
{
Mat img = _img.getMat();
CvMat c_img = img;
CvMat c_img = cvMat(img);
cvShowImage(winname.c_str(), &c_img);
}
else
@@ -409,8 +409,8 @@ void cv::imshow(const String& winname, const ogl::Texture2D& _tex)
{
CV_TRACE_FUNCTION();
#ifndef HAVE_OPENGL
(void) winname;
(void) _tex;
CV_UNUSED(winname);
CV_UNUSED(_tex);
CV_Error(cv::Error::OpenGlNotSupported, "The library is compiled without OpenGL support");
#else
const double useGl = getWindowProperty(winname, WND_PROP_OPENGL);
@@ -728,7 +728,7 @@ CV_IMPL void cvDisplayOverlay(const char* , const char* , int )
CV_IMPL int cvStartLoop(int (*)(int argc, char *argv[]), int , char* argv[])
{
(void)argv;
CV_UNUSED(argv);
CV_NO_GUI_ERROR("cvStartLoop");
}