potok/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-07-29 23:33:05 +04:00
Code Packages Releases Wiki Activity

minor

Browse Source
This commit is contained in:
Vladislav Vinogradov
2011-12-13 06:25:37 +00:00
parent 056d015b38
commit 6310622be3
2 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/highgui/src/window_QT.cpp
+4 -1
View File
@@ -2311,6 +2311,7 @@ QWidget* DefaultViewPort::getWidget()
void DefaultViewPort::setMouseCallBack(CvMouseCallback m, void* param)
{
on_mouse = m;
on_mouse_param = param;
}
@@ -3358,7 +3359,9 @@ void GlFuncTab_QT::generateBitmapFont(const std::string& family, int height, int
__BEGIN__;
#ifndef Q_WS_WIN
glXUseXFont(font.handle(), start, count, base);
font.setStyleStrategy(QFont::OpenGLCompatible);
if (font.handle())
glXUseXFont(font.handle(), start, count, base);
#else
SelectObject(hDC, font.handle());
if (!wglUseFontBitmaps(hDC, start, count, base))