generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests 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

2
CMakeLists.txt
View File

@@ -1125,7 +1125,7 @@ if(WIN32)
endif() endif()
endif() endif()
if (WITH_OPENGL) if (WITH_OPENGL AND NOT HAVE_QT_OPENGL)
find_package(OpenGL QUIET) find_package(OpenGL QUIET)
if (OPENGL_FOUND) if (OPENGL_FOUND)

6
modules/highgui/src/window.cpp
View File

@@ -127,7 +127,8 @@ CV_IMPL double cvGetWindowProperty(const char* name, int prop_id)
case CV_WND_PROP_OPENGL: case CV_WND_PROP_OPENGL:
#if defined WIN32 || defined _WIN32 #if defined (HAVE_QT)
#elif defined WIN32 || defined _WIN32
return cvGetOpenGlProp_W32(name); return cvGetOpenGlProp_W32(name);
#else #else
return -1; return -1;
@@ -137,6 +138,7 @@ CV_IMPL double cvGetWindowProperty(const char* name, int prop_id)
default: default:
return -1; return -1;
} }
return -1;
} }
void cv::namedWindow( const string& winname, int flags ) 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_OPENGL
#ifndef HAVE_QT
CV_IMPL void cvCreateOpenGLCallback(const char*, CvOpenGLCallback, void*, double, double, double) CV_IMPL void cvCreateOpenGLCallback(const char*, CvOpenGLCallback, void*, double, double, double)
{ {
CV_Error(CV_OpenGlNotSupported, "The library is compiled without OpenGL support"); CV_Error(CV_OpenGlNotSupported, "The library is compiled without OpenGL support");
} }
#endif
CV_IMPL void cvSetOpenGlContext(const char*) CV_IMPL void cvSetOpenGlContext(const char*)
{ {

8
modules/highgui/src/window_w32.cpp
View File

@@ -581,14 +581,6 @@ double cvGetOpenGlProp_W32(const char* name)
typedef ptrdiff_t GLsizeiptr; typedef ptrdiff_t GLsizeiptr;
#endif #endif
#ifndef GL_BGR
#define GL_BGR 0x80E0
#endif
#ifndef GL_BGRA
#define GL_BGRA 0x80E1
#endif
namespace namespace
{ {
typedef void (APIENTRYP PFNGLGENBUFFERSPROC ) (GLsizei n, GLuint *buffers); typedef void (APIENTRYP PFNGLGENBUFFERSPROC ) (GLsizei n, GLuint *buffers);