From 82e4e1816f5417637b26496009fb239302bee325 Mon Sep 17 00:00:00 2001 From: Alexandr Kondratev Date: Thu, 21 Jul 2016 17:51:19 +0300 Subject: [PATCH] highgui: removed excessed variable orient in window_gtk --- modules/highgui/src/window_gtk.cpp | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/modules/highgui/src/window_gtk.cpp b/modules/highgui/src/window_gtk.cpp index 475f85f9f6..c769879bdd 100644 --- a/modules/highgui/src/window_gtk.cpp +++ b/modules/highgui/src/window_gtk.cpp @@ -1970,9 +1970,9 @@ static gboolean icvOnMouse( GtkWidget *widget, GdkEvent *event, gpointer user_da #if defined(GTK_VERSION3_4) // NOTE: in current implementation doesn't possible to put into callback function delta_x and delta_y separetely double delta = (event->scroll.delta_x + event->scroll.delta_y); - int orient = (event->scroll.delta_y!=0) ? CV_EVENT_MOUSEHWHEEL : CV_EVENT_MOUSEWHEEL; + cv_event = (event->scroll.delta_y!=0) ? CV_EVENT_MOUSEHWHEEL : CV_EVENT_MOUSEWHEEL; #else - int orient = CV_EVENT_MOUSEWHEEL; + cv_event = CV_EVENT_MOUSEWHEEL; #endif //GTK_VERSION3_4 state = event->scroll.state; @@ -1982,15 +1982,14 @@ static gboolean icvOnMouse( GtkWidget *widget, GdkEvent *event, gpointer user_da case GDK_SCROLL_SMOOTH: flags |= (((int)delta << 16)); break; #endif //GTK_VERSION3_4 - case GDK_SCROLL_LEFT: orient = CV_EVENT_MOUSEHWHEEL; + case GDK_SCROLL_LEFT: cv_event = CV_EVENT_MOUSEHWHEEL; case GDK_SCROLL_UP: flags |= ((-(int)1 << 16)); break; - case GDK_SCROLL_RIGHT: orient = CV_EVENT_MOUSEHWHEEL; + case GDK_SCROLL_RIGHT: cv_event = CV_EVENT_MOUSEHWHEEL; case GDK_SCROLL_DOWN: flags |= (((int)1 << 16)); break; default: ; }; - cv_event = orient; } if( cv_event >= 0 )