[evince] libview: Make sure we don't return negative values when converting view points to doc points
- From: Carlos Garcia Campos <carlosgc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [evince] libview: Make sure we don't return negative values when converting view points to doc points
- Date: Sun, 2 Mar 2014 13:10:02 +0000 (UTC)
commit df0015052c2773badfb58f7c6ab80d1bdee9f5b9
Author: Carlos Garcia Campos <carlosgc gnome org>
Date: Sun Mar 2 14:01:32 2014 +0100
libview: Make sure we don't return negative values when converting view points to doc points
libview/ev-view.c | 12 ++++--------
1 files changed, 4 insertions(+), 8 deletions(-)
---
diff --git a/libview/ev-view.c b/libview/ev-view.c
index be6d17b..0dacb6a 100644
--- a/libview/ev-view.c
+++ b/libview/ev-view.c
@@ -1289,8 +1289,8 @@ _ev_view_transform_view_point_to_doc_point (EvView *view,
double *doc_point_x,
double *doc_point_y)
{
- *doc_point_x = (double) (view_point->x - page_area->x - border->left) / view->scale;
- *doc_point_y = (double) (view_point->y - page_area->y - border->right) / view->scale;
+ *doc_point_x = MAX ((double) (view_point->x - page_area->x - border->left) / view->scale, 0);
+ *doc_point_y = MAX ((double) (view_point->y - page_area->y - border->right) / view->scale, 0);
}
void
@@ -1300,8 +1300,8 @@ _ev_view_transform_view_rect_to_doc_rect (EvView *view,
GtkBorder *border,
EvRectangle *doc_rect)
{
- doc_rect->x1 = (double) (view_rect->x - page_area->x - border->left) / view->scale;
- doc_rect->y1 = (double) (view_rect->y - page_area->y - border->right) / view->scale;
+ doc_rect->x1 = MAX ((double) (view_rect->x - page_area->x - border->left) / view->scale, 0);
+ doc_rect->y1 = MAX ((double) (view_rect->y - page_area->y - border->right) / view->scale, 0);
doc_rect->x2 = doc_rect->x1 + (double) view_rect->width / view->scale;
doc_rect->y2 = doc_rect->y1 + (double) view_rect->height / view->scale;
}
@@ -7957,8 +7957,6 @@ compute_new_selection (EvView *view,
&page_area, &border,
&selection->rect.x1,
&selection->rect.y1);
- selection->rect.x1 = MAX (selection->rect.x1, 0);
- selection->rect.y1 = MAX (selection->rect.y1, 0);
}
/* If the selection is contained within just one page,
@@ -7972,8 +7970,6 @@ compute_new_selection (EvView *view,
&page_area, &border,
&selection->rect.x2,
&selection->rect.y2);
- selection->rect.x2 = MAX (selection->rect.x2, 0);
- selection->rect.y2 = MAX (selection->rect.y2, 0);
}
list = g_list_prepend (list, selection);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]