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

bring back bounds check and switch to floor

Browse Source
This commit is contained in:
Smirnov Egor 2021-05-24 16:39:02 +03:00 committed by rogday
parent b335fe67b0
commit fb68fe8930
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1787,8 +1787,8 @@ static gboolean icvOnMouse( GtkWidget *widget, GdkEvent *event, gpointer user_da
GdkEventMotion* event_motion = (GdkEventMotion*)event; GdkEventMotion* event_motion = (GdkEventMotion*)event;
cv_event = CV_EVENT_MOUSEMOVE; cv_event = CV_EVENT_MOUSEMOVE;
pt32f.x = cvRound(event_motion->x); pt32f.x = cvFloor(event_motion->x);
pt32f.y = cvRound(event_motion->y); pt32f.y = cvFloor(event_motion->y);
state = event_motion->state; state = event_motion->state;
} }
else if( event->type == GDK_BUTTON_PRESS || else if( event->type == GDK_BUTTON_PRESS ||
@ -1796,8 +1796,8 @@ static gboolean icvOnMouse( GtkWidget *widget, GdkEvent *event, gpointer user_da
event->type == GDK_2BUTTON_PRESS ) event->type == GDK_2BUTTON_PRESS )
{ {
GdkEventButton* event_button = (GdkEventButton*)event; GdkEventButton* event_button = (GdkEventButton*)event;
pt32f.x = cvRound(event_button->x); pt32f.x = cvFloor(event_button->x);
pt32f.y = cvRound(event_button->y); pt32f.y = cvFloor(event_button->y);
if( event_button->type == GDK_BUTTON_PRESS ) if( event_button->type == GDK_BUTTON_PRESS )
@ -1874,8 +1874,8 @@ static gboolean icvOnMouse( GtkWidget *widget, GdkEvent *event, gpointer user_da
pt = cvPointFrom32f( pt32f ); pt = cvPointFrom32f( pt32f );
} }
// if((unsigned)pt.x < (unsigned)(image_widget->original_image->width) && if((unsigned)pt.x < (unsigned)(image_widget->original_image->width) &&
// (unsigned)pt.y < (unsigned)(image_widget->original_image->height) ) (unsigned)pt.y < (unsigned)(image_widget->original_image->height) )
{ {
flags |= BIT_MAP(state, GDK_SHIFT_MASK, CV_EVENT_FLAG_SHIFTKEY) | flags |= BIT_MAP(state, GDK_SHIFT_MASK, CV_EVENT_FLAG_SHIFTKEY) |
BIT_MAP(state, GDK_CONTROL_MASK, CV_EVENT_FLAG_CTRLKEY) | BIT_MAP(state, GDK_CONTROL_MASK, CV_EVENT_FLAG_CTRLKEY) |