summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gtk2_ardour/editor_ops.cc2
-rw-r--r--libs/canvas/item.cc2
2 files changed, 2 insertions, 2 deletions
diff --git a/gtk2_ardour/editor_ops.cc b/gtk2_ardour/editor_ops.cc
index 478569cfdc..beebd8505f 100644
--- a/gtk2_ardour/editor_ops.cc
+++ b/gtk2_ardour/editor_ops.cc
@@ -1392,7 +1392,7 @@ Editor::temporal_zoom (framecnt_t fpp)
// segfaults for lack of memory. If somebody decides this is not high enough I
// believe it can be raisen to higher values but some limit must be in place.
- nfpp = min (fpp, 8589934592);
+ nfpp = min (fpp, (framecnt_t) 8589934592);
nfpp = max ((framecnt_t) 1, fpp);
new_page_size = (framepos_t) floor (_visible_canvas_width * nfpp);
diff --git a/libs/canvas/item.cc b/libs/canvas/item.cc
index dca3064bce..b553d8d6ae 100644
--- a/libs/canvas/item.cc
+++ b/libs/canvas/item.cc
@@ -171,7 +171,7 @@ Item::window_to_item (ArdourCanvas::Duple const & d) const
return _canvas->window_to_canvas (canvas_to_item (d));
}
-Rect
+ArdourCanvas::Rect
Item::item_to_window (ArdourCanvas::Rect const & r) const
{
return _canvas->canvas_to_window (item_to_canvas (r));