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

fixed build under linux

Browse Source
This commit is contained in:
Vladislav Vinogradov 2011-12-12 13:57:37 +00:00
parent 3afc97e67e
commit 061f032719
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -41,6 +41,8 @@
#if defined(HAVE_QT) #if defined(HAVE_QT)
#include <memory>
#include <window_QT.h> #include <window_QT.h>
#include <math.h> #include <math.h>
@ -49,6 +51,12 @@
#include <windows.h> #include <windows.h>
#endif #endif
#ifdef HAVE_QT_OPENGL
#ifdef Q_WS_X11
#include <GL/glx.h>
#endif
#endif
//Static and global first //Static and global first
static GuiReceiver *guiMainThread = NULL; static GuiReceiver *guiMainThread = NULL;
@ -3176,7 +3184,7 @@ public:
#ifdef Q_WS_WIN #ifdef Q_WS_WIN
GlFuncTab_QT(HDC hDC); GlFuncTab_QT(HDC hDC);
#else #else
GlFuncTab_QT(HDC hDC); GlFuncTab_QT();
#endif #endif
void genBuffers(int n, unsigned int* buffers) const; void genBuffers(int n, unsigned int* buffers) const;
@ -3350,8 +3358,7 @@ void GlFuncTab_QT::generateBitmapFont(const std::string& family, int height, int
__BEGIN__; __BEGIN__;
#ifndef Q_WS_WIN #ifndef Q_WS_WIN
if (!glXUseXFont(font.handle(), start, count, base)) glXUseXFont(font.handle(), start, count, base);
CV_ERROR(CV_OpenGlApiCallError, "Can't create font");
#else #else
SelectObject(hDC, font.handle()); SelectObject(hDC, font.handle());
if (!wglUseFontBitmaps(hDC, start, count, base)) if (!wglUseFontBitmaps(hDC, start, count, base))