Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
O
opencv
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
opencv
Commits
061f0327
Commit
061f0327
authored
Dec 12, 2011
by
Vladislav Vinogradov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fixed build under linux
parent
3afc97e6
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
10 additions
and
3 deletions
+10
-3
window_QT.cpp
modules/highgui/src/window_QT.cpp
+10
-3
No files found.
modules/highgui/src/window_QT.cpp
View file @
061f0327
...
...
@@ -41,6 +41,8 @@
#if defined(HAVE_QT)
#include <memory>
#include <window_QT.h>
#include <math.h>
...
...
@@ -49,6 +51,12 @@
#include <windows.h>
#endif
#ifdef HAVE_QT_OPENGL
#ifdef Q_WS_X11
#include <GL/glx.h>
#endif
#endif
//Static and global first
static
GuiReceiver
*
guiMainThread
=
NULL
;
...
...
@@ -3176,7 +3184,7 @@ public:
#ifdef Q_WS_WIN
GlFuncTab_QT
(
HDC
hDC
);
#else
GlFuncTab_QT
(
HDC
hDC
);
GlFuncTab_QT
();
#endif
void
genBuffers
(
int
n
,
unsigned
int
*
buffers
)
const
;
...
...
@@ -3350,8 +3358,7 @@ void GlFuncTab_QT::generateBitmapFont(const std::string& family, int height, int
__BEGIN__
;
#ifndef Q_WS_WIN
if
(
!
glXUseXFont
(
font
.
handle
(),
start
,
count
,
base
))
CV_ERROR
(
CV_OpenGlApiCallError
,
"Can't create font"
);
glXUseXFont
(
font
.
handle
(),
start
,
count
,
base
);
#else
SelectObject
(
hDC
,
font
.
handle
());
if
(
!
wglUseFontBitmaps
(
hDC
,
start
,
count
,
base
))
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment