Skip to content

O
opencv
Commit 061f0327 authored by Vladislav Vinogradov's avatar Vladislav Vinogradov
Browse files
Options

fixed build under linux

parent 3afc97e6
Hide whitespace changes
Inline Side-by-side
Showing with 10 additions and 3 deletions
modules/highgui/src/window_QT.cpp
View file @ 061f0327
...@@ -41,6 +41,8 @@ ...@@ -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 @@ ...@@ -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: ...@@ -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 ...@@ -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))
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment