mirror of
https://github.com/opencv/opencv.git
synced 2025-07-25 22:57:53 +08:00
Merge pull request #7734 from alalek:fix_gtk_deprecated
This commit is contained in:
commit
fa757ebd92
@ -619,9 +619,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;
|
||||||
|
Loading…
Reference in New Issue
Block a user