generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Ticket #458

Browse Source
This commit is contained in:
Yannick Verdie 2010-07-12 14:39:31 +00:00
parent 1c856283ec
commit f2971aebd0
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/highgui/include/opencv2/highgui/highgui_c.h
View File

@ -74,7 +74,7 @@ enum { CV_STYLE_NORMAL = 0,//QFont::StyleNormal,
//for color cvScalar(blue_component, green_component, red\_component[, alpha_component])
//and alpha= 0 <-> 0xFF (not transparent <-> transparent)
CVAPI(CvFont) cvFont_Qt(const char* nameFont, int pointSize CV_DEFAULT(-1), CvScalar color = cvScalarAll(0), int weight CV_DEFAULT(CV_FONT_NORMAL), int style CV_DEFAULT(CV_STYLE_NORMAL), int spacing CV_DEFAULT(0));
CVAPI(CvFont) cvFont_Qt(const char* nameFont, int pointSize CV_DEFAULT(-1), CvScalar color CV_DEFAULT(cvScalarAll(0)), int weight CV_DEFAULT(CV_FONT_NORMAL), int style CV_DEFAULT(CV_STYLE_NORMAL), int spacing CV_DEFAULT(0));
CVAPI(void) cvAddText( CvArr* img, const char* text, CvPoint org, CvFont *arg2);

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

@ -1654,14 +1654,14 @@ void ViewPort::paintEvent(QPaintEvent* event)
#if defined(OPENCV_GL)
if ( mode_display == CV_MODE_OPENGL && on_openGL_draw3D)
{
myPainter.beginNativePainting();
//myPainter.beginNativePainting();
setGL(width(),height());
on_openGL_draw3D(on_openGL_param);
//draw3D();
unsetGL();
myPainter.endNativePainting();
//myPainter.endNativePainting();
}
#endif