pull/13383/head
Vladislav Vinogradov 13 years ago
parent 056d015b38
commit 6310622be3
  1. 5
      modules/highgui/src/window_QT.cpp
  2. 2
      samples/cpp/point_cloud.cpp

@ -2311,6 +2311,7 @@ QWidget* DefaultViewPort::getWidget()
void DefaultViewPort::setMouseCallBack(CvMouseCallback m, void* param) void DefaultViewPort::setMouseCallBack(CvMouseCallback m, void* param)
{ {
on_mouse = m; on_mouse = m;
on_mouse_param = param; on_mouse_param = param;
} }
@ -3358,7 +3359,9 @@ void GlFuncTab_QT::generateBitmapFont(const std::string& family, int height, int
__BEGIN__; __BEGIN__;
#ifndef Q_WS_WIN #ifndef Q_WS_WIN
glXUseXFont(font.handle(), start, count, base); font.setStyleStrategy(QFont::OpenGLCompatible);
if (font.handle())
glXUseXFont(font.handle(), start, count, base);
#else #else
SelectObject(hDC, font.handle()); SelectObject(hDC, font.handle());
if (!wglUseFontBitmaps(hDC, start, count, base)) if (!wglUseFontBitmaps(hDC, start, count, base))

@ -198,7 +198,7 @@ int main(int argc, const char* argv[])
while (true) while (true)
{ {
int key = waitKey(1); int key = waitKey(10);
if (key >= 0) if (key >= 0)
key = key & 0xff; key = key & 0xff;

Loading…
Cancel
Save