mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-06-07 17:44:04 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

highgui: Set hard GLib requirement to >=2.32

Browse Source 
This version has been released 10 years ago.
This commit is contained in:
Corentin Noël 2023-02-14 13:28:42 +01:00 committed by Corentin Noël
parent 76350cd30f
commit f1f14ce403
2 changed files with 1 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/highgui/cmake/detect_gtk.cmake
View File

@ -20,7 +20,7 @@ if(WITH_GTK)
endif() endif()
endif() endif()
endif() endif()
ocv_check_modules(GTHREAD gthread-2.0) ocv_check_modules(GTHREAD gthread-2.0>=2.32)
if(HAVE_GTK AND NOT HAVE_GTHREAD) if(HAVE_GTK AND NOT HAVE_GTHREAD)
message(FATAL_ERROR "gthread not found. This library is required when building with GTK support") message(FATAL_ERROR "gthread not found. This library is required when building with GTK support")
else() else()

14
modules/highgui/src/window_gtk.cpp
View File

@ -659,14 +659,6 @@ CV_IMPL int cvStartWindowThread(){
cvInitSystem(0,NULL); cvInitSystem(0,NULL);
if (!thread_started) if (!thread_started)
{ {
#if !GLIB_CHECK_VERSION(2, 32, 0) // https://github.com/GNOME/glib/blame/b4d58a7105bb9d75907233968bb534b38f9a6e43/glib/deprecated/gthread.h#L274
if (!g_thread_supported ())
{
/* the GThread system wasn't inited, so init it */
g_thread_init(NULL);
}
#endif
(void)getWindowMutex(); // force mutex initialization (void)getWindowMutex(); // force mutex initialization
// protects the 'last key pressed' variable // protects the 'last key pressed' variable
@ -675,13 +667,7 @@ 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
window_thread = g_thread_create(icvWindowThreadLoop,
NULL, TRUE, NULL);
#else
window_thread = g_thread_new("OpenCV window update", icvWindowThreadLoop, NULL); window_thread = g_thread_new("OpenCV window update", icvWindowThreadLoop, NULL);
#endif
} }
thread_started = window_thread!=NULL; thread_started = window_thread!=NULL;
return thread_started; return thread_started;