fixed new OpenGL functionality under Qt

CMakeLists.txt

@@ -894,20 +894,17 @@ if (WITH_QT)
     find_package(Qt4)
     if (QT4_FOUND)
         set(HAVE_QT 1)
-        add_definitions(-DHAVE_QT)#We need to define te macro this way, using cvconfig.h.cmake does not work
-        find_package (OpenGL QUIET)
+        add_definitions(-DHAVE_QT) #We need to define te macro this way, using cvconfig.h.cmake does not work
 
-        #if (NOT WIN32)
         if (WITH_OPENGL)
+            find_package (OpenGL QUIET)
             if (QT_QTOPENGL_FOUND AND OPENGL_FOUND)
-                #set(HAVE_OPENGL 1)
+                set(HAVE_OPENGL 1)
                 set(HAVE_QT_OPENGL 1)
                 add_definitions(-DHAVE_QT_OPENGL)
-                #link_directories("${OPENGL_LIBRARIES}")
                 set(OPENCV_LINKER_LIBS ${OPENCV_LINKER_LIBS} ${OPENGL_LIBRARIES})
             endif()
         endif()
-        #endif()
     endif()
 endif()
 

modules/highgui/include/opencv2/highgui/highgui.hpp

@@ -125,14 +125,8 @@ CV_EXPORTS_W void setTrackbarPos(const string& trackbarname, const string& winna
 
 // OpenGL support
 
-typedef void (CV_CDECL *OpenGLCallback)(void* userdata);
-CV_EXPORTS void createOpenGLCallback(const string& winname, OpenGLCallback onOpenGlDraw, void* userdata = 0);
-
 typedef void (*OpenGlDrawCallback)(void* userdata);
-static inline void setOpenGlDrawCallback(const string& winname, OpenGlDrawCallback onOpenGlDraw, void* userdata = 0)
-{
-    createOpenGLCallback(winname, onOpenGlDraw, userdata);
-}
+CV_EXPORTS void setOpenGlDrawCallback(const string& winname, OpenGlDrawCallback onOpenGlDraw, void* userdata = 0);
 
 CV_EXPORTS void setOpenGlContext(const string& winname);
 

modules/highgui/include/opencv2/highgui/highgui_c.h

@@ -251,8 +251,8 @@ CVAPI(int) cvWaitKey(int delay CV_DEFAULT(0));
 
 // OpenGL support
 
-typedef void (CV_CDECL *CvOpenGLCallback)(void* userdata);
-CVAPI(void) cvCreateOpenGLCallback( const char* window_name, CvOpenGLCallback callbackOpenGL, void* userdata CV_DEFAULT(NULL), double angle CV_DEFAULT(-1), double zmin CV_DEFAULT(-1), double zmax CV_DEFAULT(-1));
+typedef void (CV_CDECL *CvOpenGlDrawCallback)(void* userdata);
+CVAPI(void) cvSetOpenGlDrawCallback(const char* window_name, CvOpenGlDrawCallback callback, void* userdata CV_DEFAULT(NULL));
 
 CVAPI(void) cvSetOpenGlContext(const char* window_name);
 CVAPI(void) cvUpdateWindow(const char* window_name);

modules/highgui/src/precomp.hpp

@@ -198,10 +198,14 @@ double cvGetOpenGlProp_GTK(const char* name);
 #if defined (HAVE_QT)
 double cvGetModeWindow_QT(const char* name);
 void cvSetModeWindow_QT(const char* name, double prop_value);
+
 double cvGetPropWindow_QT(const char* name);
 void cvSetPropWindow_QT(const char* name,double prop_value);
+
 double cvGetRatioWindow_QT(const char* name);
 void cvSetRatioWindow_QT(const char* name,double prop_value);
+
+double cvGetOpenGlProp_QT(const char* name);
 #endif
 
 // OpenGL

modules/highgui/src/window.cpp

@@ -133,6 +133,7 @@ CV_IMPL double cvGetWindowProperty(const char* name, int prop_id)
     case CV_WND_PROP_OPENGL:
 
         #if defined (HAVE_QT)
+            return cvGetOpenGlProp_QT(name);
         #elif defined WIN32 || defined _WIN32
             return cvGetOpenGlProp_W32(name);
         #elif defined (HAVE_GTK)
@@ -218,9 +219,9 @@ int cv::startWindowThread()
 
 // OpenGL support
 
-void cv::createOpenGLCallback(const string& name, OpenGLCallback callback, void* userdata)
+void cv::setOpenGlDrawCallback(const string& name, OpenGlDrawCallback callback, void* userdata)
 {
-    cvCreateOpenGLCallback(name.c_str(), callback, userdata);
+    cvSetOpenGlDrawCallback(name.c_str(), callback, userdata);
 }
 
 void cv::setOpenGlContext(const string& windowName)
@@ -344,8 +345,6 @@ void cv::imshow( const string& winname, InputArray _img )
     }
     else
     {
-        namedWindow(winname, WINDOW_OPENGL | WINDOW_AUTOSIZE);
-
         double autoSize = getWindowProperty(winname, WND_PROP_AUTOSIZE);
 
         if (autoSize > 0)
@@ -492,12 +491,10 @@ void cv::pointCloudShow(const std::string& winname, const cv::GlCamera& camera,
 
 #ifndef HAVE_OPENGL
 
-#ifndef HAVE_QT
-CV_IMPL void cvCreateOpenGLCallback(const char*, CvOpenGLCallback, void*, double, double, double)
+CV_IMPL void cvSetOpenGlDrawCallback(const char*, CvOpenGlDrawCallback, void*)
 {
     CV_Error(CV_OpenGlNotSupported, "The library is compiled without OpenGL support");
 }
-#endif
 
 CV_IMPL void cvSetOpenGlContext(const char*)
 {

modules/highgui/src/window_gtk.cpp

@@ -427,7 +427,7 @@ typedef struct CvWindow
 #ifdef HAVE_OPENGL
     bool useGl;
 
-    CvOpenGLCallback glDrawCallback;
+    CvOpenGlDrawCallback glDrawCallback;
     void* glDrawData;
 
     CvOpenGlCleanCallback glCleanCallback;
@@ -1216,7 +1216,7 @@ CV_IMPL void cvUpdateWindow(const char* name)
     __END__;
 }
 
-CV_IMPL void cvCreateOpenGLCallback(const char* name, CvOpenGLCallback callback, void* userdata, double, double, double)
+CV_IMPL void cvSetOpenGlDrawCallback(const char* name, CvOpenGlDrawCallback callback, void* userdata)
 {
     CvWindow* window;
 

modules/highgui/src/window_w32.cpp

@@ -174,7 +174,7 @@ typedef struct CvWindow
     bool useGl;
     HGLRC hGLRC;
 
-    CvOpenGLCallback glDrawCallback;
+    CvOpenGlDrawCallback glDrawCallback;
     void* glDrawData;
 
     CvOpenGlCleanCallback glCleanCallback;
@@ -1121,7 +1121,7 @@ CV_IMPL void cvUpdateWindow(const char* name)
     __END__;
 }
 
-CV_IMPL void cvCreateOpenGLCallback(const char* name, CvOpenGLCallback callback, void* userdata, double, double, double)
+CV_IMPL void cvSetOpenGlDrawCallback(const char* name, CvOpenGlDrawCallback callback, void* userdata)
 {
     CV_FUNCNAME( "cvCreateOpenGLCallback" );