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

fixed cleanup, fixed unused context

Browse Source
This commit is contained in:
Alexey Ershov 2015-06-29 11:46:31 +03:00
parent 3f68787051
commit 8ed45609d0
2 changed files with 21 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
samples/opengl/opengl_interop.cpp
View File

@ -42,19 +42,14 @@ public:
~GLWinApp() {} ~GLWinApp() {}
int onClose(void) virtual void cleanup()
{ {
m_shutdown = true; m_shutdown = true;
cleanup(); #if defined(__linux__)
#if defined(WIN32) || defined(_WIN32)
::DestroyWindow(m_hWnd);
#elif defined(__linux__)
glXMakeCurrent(m_display, None, NULL); glXMakeCurrent(m_display, None, NULL);
glXDestroyContext(m_display, m_glctx); glXDestroyContext(m_display, m_glctx);
XDestroyWindow(m_display, m_window);
XCloseDisplay(m_display);
#endif #endif
return 0; WinApp::cleanup();
} }
#if defined(WIN32) || defined(_WIN32) #if defined(WIN32) || defined(_WIN32)
@ -75,12 +70,14 @@ public:
} }
else if (wParam == VK_ESCAPE) else if (wParam == VK_ESCAPE)
{ {
return onClose(); cleanup();
return 0;
} }
break; break;
case WM_CLOSE: case WM_CLOSE:
return onClose(); cleanup();
return 0;
case WM_DESTROY: case WM_DESTROY:
::PostQuitMessage(0); ::PostQuitMessage(0);
@ -117,7 +114,7 @@ public:
if ((Atom)e.xclient.data.l[0] == m_WM_DELETE_WINDOW) if ((Atom)e.xclient.data.l[0] == m_WM_DELETE_WINDOW)
{ {
m_end_loop = true; m_end_loop = true;
onClose(); cleanup();
} }
else else
{ {
@ -144,7 +141,7 @@ public:
break; break;
case XK_Escape: case XK_Escape:
m_end_loop = true; m_end_loop = true;
onClose(); cleanup();
break; break;
} }
break; break;
@ -155,7 +152,7 @@ public:
} }
#endif #endif
int init(void) int init()
{ {
#if defined(WIN32) || defined(_WIN32) #if defined(WIN32) || defined(_WIN32)
m_hDC = GetDC(m_hWnd); m_hDC = GetDC(m_hWnd);
@ -180,7 +177,7 @@ public:
if (cv::ocl::haveOpenCL()) if (cv::ocl::haveOpenCL())
{ {
m_oclCtx = cv::ogl::ocl::initializeContextFromGL(); (void) cv::ogl::ocl::initializeContextFromGL();
} }
m_oclDevName = cv::ocl::useOpenCL() ? m_oclDevName = cv::ocl::useOpenCL() ?
@ -342,11 +339,6 @@ public:
return 0; return 0;
} }
int cleanup(void)
{
return 0;
}
protected: protected:
#if defined(WIN32) || defined(_WIN32) #if defined(WIN32) || defined(_WIN32)
@ -415,7 +407,6 @@ private:
cv::VideoCapture m_cap; cv::VideoCapture m_cap;
cv::Mat m_frame_bgr; cv::Mat m_frame_bgr;
cv::Mat m_frame_rgba; cv::Mat m_frame_rgba;
cv::ocl::Context m_oclCtx;
cv::String m_oclDevName; cv::String m_oclDevName;
}; };

10
samples/opengl/winapp.hpp
View File

@ -116,6 +116,16 @@ public:
return init(); return init();
} }
virtual void cleanup()
{
#if defined(WIN32) || defined(_WIN32)
::DestroyWindow(m_hWnd);
#elif defined(__linux__)
XDestroyWindow(m_display, m_window);
XCloseDisplay(m_display);
#endif
}
#if defined(WIN32) || defined(_WIN32) #if defined(WIN32) || defined(_WIN32)
virtual LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) = 0; virtual LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) = 0;
#endif #endif