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

fixed build with Qt

Browse Source
This commit is contained in:
Vladislav Vinogradov
2011-11-27 10:13:08 +00:00
parent 467f936459
commit 35e69a1ee3
3 changed files with 7 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/highgui/src/window.cpp
+6 -2
View File
@@ -126,8 +126,9 @@ CV_IMPL double cvGetWindowProperty(const char* name, int prop_id)
break;
case CV_WND_PROP_OPENGL:
#if defined WIN32 || defined _WIN32
#if defined (HAVE_QT)
#elif defined WIN32 || defined _WIN32
return cvGetOpenGlProp_W32(name);
#else
return -1;
@@ -137,6 +138,7 @@ CV_IMPL double cvGetWindowProperty(const char* name, int prop_id)
default:
return -1;
}
return -1;
}
void cv::namedWindow( const string& winname, int flags )
@@ -591,10 +593,12 @@ void cv::pointCloudShow(const string& winname, const gpu::GlCamera& camera, Inpu
#ifndef HAVE_OPENGL
#ifndef HAVE_QT
CV_IMPL void cvCreateOpenGLCallback(const char*, CvOpenGLCallback, void*, double, double, double)
{
CV_Error(CV_OpenGlNotSupported, "The library is compiled without OpenGL support");
}
#endif
CV_IMPL void cvSetOpenGlContext(const char*)
{