Commit 7e38a2f0 authored by Vadim Pisarevsky's avatar Vadim Pisarevsky

Merge pull request #7739 from alalek:fix_gtk_deprecated_2.4

parents ac118aee 90da5933
...@@ -480,9 +480,13 @@ CV_IMPL int cvStartWindowThread(){ ...@@ -480,9 +480,13 @@ CV_IMPL int cvStartWindowThread(){
// conditional that indicates a key has been pressed // conditional that indicates a key has been pressed
cond_have_key = g_cond_new(); cond_have_key = g_cond_new();
#if !GLIB_CHECK_VERSION(2, 32, 0)
// this is the window update thread // this is the window update thread
window_thread = g_thread_create((GThreadFunc) icvWindowThreadLoop, window_thread = g_thread_create((GThreadFunc) icvWindowThreadLoop,
NULL, TRUE, NULL); NULL, TRUE, NULL);
#else
window_thread = g_thread_new("OpenCV window update", (GThreadFunc)icvWindowThreadLoop, NULL);
#endif
} }
thread_started = window_thread!=NULL; thread_started = window_thread!=NULL;
return thread_started; return thread_started;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment