From 81c69ecd1644bd08dbeb73ce49d58486ee1b57d6 Mon Sep 17 00:00:00 2001 From: Alexandr Kondratev Date: Wed, 29 Jun 2016 23:01:57 +0300 Subject: [PATCH] highgui: window_gtk.cpp directive boolean operations or/and replaced by ||/&& to keep compatible with older systems --- modules/highgui/src/window_gtk.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/highgui/src/window_gtk.cpp b/modules/highgui/src/window_gtk.cpp index 249d452e8d..9e4798e889 100644 --- a/modules/highgui/src/window_gtk.cpp +++ b/modules/highgui/src/window_gtk.cpp @@ -1993,10 +1993,10 @@ static gboolean icvOnMouse( GtkWidget *widget, GdkEvent *event, gpointer user_da case GDK_SCROLL_LEFT: orient = CV_EVENT_MOUSEHWHEEL; case GDK_SCROLL_DOWN: flags |= ((-1 << 16) | orient); break; -#if (GTK_MAJOR_VERSION > 3 or (GTK_MAJOR_VERSION == 3 and GTK_MINOR_VERSION >= 4)) +#if (GTK_MAJOR_VERSION > 3 || (GTK_MAJOR_VERSION == 3 && GTK_MINOR_VERSION >= 4)) case GDK_SCROLL_SMOOTH: // to prevent make warning; TODO ; -#endif //GTK_MAJOR_VERSION > 3 or (GTK_MAJOR_VERSION == 3 and GTK_MINOR_VERSION >= 4) +#endif //GTK_MAJOR_VERSION > 3 || (GTK_MAJOR_VERSION == 3 && GTK_MINOR_VERSION >= 4) }; }; flags = flags |