mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2024-11-30 14:29:49 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merged the trunk r8911

Browse Source
This commit is contained in:
Andrey Kamaev 2012-07-02 14:21:51 +00:00
parent 139cc61001
commit d2b36d74cd
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/highgui/src/window_QT.cpp
View File

@ -3352,7 +3352,9 @@ void GlFuncTab_QT::unmapBuffer(unsigned int target) const
void GlFuncTab_QT::generateBitmapFont(const std::string& family, int height, int weight, bool italic, bool /*underline*/, int start, int count, int base) const
{
//CV_FUNCNAME( "GlFuncTab_QT::generateBitmapFont" );
#ifdef Q_WS_WIN
CV_FUNCNAME( "GlFuncTab_QT::generateBitmapFont" );
#endif
QFont font(QString(family.c_str()), height, weight, italic);