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

Merge pull request #11895 from alalek:fix_fn_types

Browse Source
This commit is contained in:
Alexander Alekhin 2018-07-06 12:01:31 +00:00
commit 3b01777c98
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -447,8 +447,9 @@ cvImageWidget_destroy (GtkObject *object)
#endif //GTK_VERSION3 #endif //GTK_VERSION3
} }
static void cvImageWidget_class_init (CvImageWidgetClass * klass) static void cvImageWidget_class_init (gpointer g_class, gpointer /*class_data*/)
{ {
CvImageWidgetClass* klass = (CvImageWidgetClass*)g_class;
#if defined (GTK_VERSION3) #if defined (GTK_VERSION3)
GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass); GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
#else #else
@ -478,8 +479,9 @@ static void cvImageWidget_class_init (CvImageWidgetClass * klass)
} }
static void static void
cvImageWidget_init (CvImageWidget *image_widget) cvImageWidget_init(GTypeInstance* instance, gpointer /*g_class*/)
{ {
CvImageWidget* image_widget = (CvImageWidget*)instance;
image_widget->original_image=0; image_widget->original_image=0;
image_widget->scaled_image=0; image_widget->scaled_image=0;
image_widget->flags=0; image_widget->flags=0;
@ -494,9 +496,9 @@ GType cvImageWidget_get_type (void){
GTK_TYPE_WIDGET, GTK_TYPE_WIDGET,
(gchar*) "CvImageWidget", (gchar*) "CvImageWidget",
sizeof(CvImageWidgetClass), sizeof(CvImageWidgetClass),
(GClassInitFunc) cvImageWidget_class_init, cvImageWidget_class_init,
sizeof(CvImageWidget), sizeof(CvImageWidget),
(GInstanceInitFunc) cvImageWidget_init, cvImageWidget_init,
(GTypeFlags)0 (GTypeFlags)0
); );
} }
@ -590,7 +592,7 @@ static gboolean icvOnMouse( GtkWidget *widget, GdkEvent *event, gpointer user_da
#ifdef HAVE_GTHREAD #ifdef HAVE_GTHREAD
int thread_started=0; int thread_started=0;
static gpointer icvWindowThreadLoop(); static gpointer icvWindowThreadLoop(gpointer data);
GMutex* last_key_mutex = NULL; GMutex* last_key_mutex = NULL;
GCond* cond_have_key = NULL; GCond* cond_have_key = NULL;
GMutex* window_mutex = NULL; GMutex* window_mutex = NULL;
@ -640,10 +642,10 @@ CV_IMPL int cvStartWindowThread(){
#if !GLIB_CHECK_VERSION(2, 32, 0) #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(icvWindowThreadLoop,
NULL, TRUE, NULL); NULL, TRUE, NULL);
#else #else
window_thread = g_thread_new("OpenCV window update", (GThreadFunc)icvWindowThreadLoop, NULL); window_thread = g_thread_new("OpenCV window update", icvWindowThreadLoop, NULL);
#endif #endif
} }
thread_started = window_thread!=NULL; thread_started = window_thread!=NULL;
@ -654,7 +656,7 @@ CV_IMPL int cvStartWindowThread(){
} }
#ifdef HAVE_GTHREAD #ifdef HAVE_GTHREAD
gpointer icvWindowThreadLoop() gpointer icvWindowThreadLoop(gpointer /*data*/)
{ {
while(1){ while(1){
g_mutex_lock(window_mutex); g_mutex_lock(window_mutex);