generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

highgui: window_gtk.cpp directive boolean operations or/and replaced by ||/&& to keep compatible with older systems

Browse Source
This commit is contained in:
Alexandr Kondratev 2016-06-29 23:01:57 +03:00
parent a4e9712006
commit 81c69ecd16
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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_LEFT: orient = CV_EVENT_MOUSEHWHEEL;
case GDK_SCROLL_DOWN: flags |= ((-1 << 16) | orient); case GDK_SCROLL_DOWN: flags |= ((-1 << 16) | orient);
break; 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 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 | flags = flags |