generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

working on OpenGL for Windows

Browse Source
This commit is contained in:
Yannick Verdie 2010-07-28 21:55:55 +00:00
parent 7ce53adac9
commit 8f33e89d46
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CMakeLists.txt
View File

@ -519,7 +519,8 @@ if (WITH_QT)
add_definitions(-DHAVE_QT)#We need to define te macro this way, using cvconfig.h.cmake does not work
find_package (OpenGL QUIET)
if (NOT WIN32) #WIN32 always detect OpenGL, so I disabled it.
#if (NOT WIN32) #WIN32 always detect OpenGL, so I disabled it.
if (OPENGL_INCLUDE_DIR)
if (QT_QTOPENGL_FOUND AND OPENGL_FOUND)
set(HAVE_QT_OPENGL 1)
add_definitions(-DHAVE_QT_OPENGL)

5
modules/highgui/src/window_QT.cpp
View File

@ -690,6 +690,9 @@ void GuiReceiver::isLastWindow()
GuiReceiver::~GuiReceiver()
{
if (global_control_panel)
delete global_control_panel;
delete timer;
}
@ -1394,6 +1397,8 @@ CvWindow::CvWindow(QString arg, int arg2)
CvWindow::~CvWindow()
{
printf("delete w\n");
QLayoutItem *child;
if (myGlobalLayout)