minor

2011-12-13 06:25:37 +00:00
parent 056d015b38
commit 6310622be3
2 changed files with 11 additions and 8 deletions
--- a/modules/highgui/src/window_QT.cpp
+++ b/modules/highgui/src/window_QT.cpp
@@ -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))