Ticket #458
authorYannick Verdie <no@email>
Mon, 12 Jul 2010 14:39:31 +0000 (14:39 +0000)
committerYannick Verdie <no@email>
Mon, 12 Jul 2010 14:39:31 +0000 (14:39 +0000)
modules/highgui/include/opencv2/highgui/highgui_c.h
modules/highgui/src/window_QT.cpp

index 4c4c35e..4d290dc 100644 (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);
 
index 770aea6..a43af2e 100755 (executable)
@@ -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