commit immediately post linking

[ardour.git] / libs / canvas / types.cc

diff --git a/libs/canvas/types.cc b/libs/canvas/types.cc
index 02ab77e00090c3bf6b6bfed9d56d18cf663ff195..56312741cfe8f3de957c438583c4e067f8d36fbe 100644 (file)
--- a/libs/canvas/types.cc
+++ b/libs/canvas/types.cc
@@ -10,10 +10,10 @@ Coord const ArdourCanvas::COORD_MAX = DBL_MAX;
 /* XXX: empirically arrived at */
 Coord const ArdourCanvas::CAIRO_MAX = 65536;
 
-Coord
-ArdourCanvas::safe_add (Coord a, Coord b)
+static inline Coord
+safe_add (Coord a, Coord b)
 {
-       if (a == COORD_MAX || b == COORD_MAX) {
+       if (((COORD_MAX - a) > b) || ((COORD_MAX - b) > a)) {
                return COORD_MAX;
        }