initial commit of hand merging, plus getting "ancient" waf script to work correctly

1 files changed, 141 insertions, 0 deletions

diff --git a/libs/canvas/types.cc b/libs/canvas/types.cc
new file mode 100644
index 0000000000..02ab77e000
--- /dev/null
+++ b/libs/canvas/types.cc
@@ -0,0 +1,141 @@
+#include <algorithm>
+#include <cfloat>
+#include <cassert>
+#include "canvas/types.h"
+
+using namespace std;
+using namespace ArdourCanvas;
+
+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)
+{
+	if (a == COORD_MAX || b == COORD_MAX) {
+		return COORD_MAX;
+	}
+
+	return a + b;
+}
+
+Duple
+Duple::translate (Duple t) const
+{
+	Duple d;
+
+	d.x = safe_add (x, t.x);
+	d.y = safe_add (y, t.y);
+	
+	return d;
+}
+
+boost::optional<Rect>
+Rect::intersection (Rect const & o) const
+{
+	Rect i;
+	
+	i.x0 = max (x0, o.x0);
+	i.y0 = max (y0, o.y0);
+	i.x1 = min (x1, o.x1);
+	i.y1 = min (y1, o.y1);
+
+	if (i.x0 > i.x1 || i.y0 > i.y1) {
+		return boost::optional<Rect> ();
+	}
+	
+	return boost::optional<Rect> (i);
+}
+
+Rect
+Rect::translate (Duple t) const
+{
+	Rect r;
+	
+	r.x0 = safe_add (x0, t.x);
+	r.y0 = safe_add (y0, t.y);
+	r.x1 = safe_add (x1, t.x);
+	r.y1 = safe_add (y1, t.y);
+	return r;
+}
+
+Rect
+Rect::extend (Rect const & o) const
+{
+	Rect r;
+	r.x0 = min (x0, o.x0);
+	r.y0 = min (y0, o.y0);
+	r.x1 = max (x1, o.x1);
+	r.y1 = max (y1, o.y1);
+	return r;
+}
+
+Rect
+Rect::expand (Distance amount) const
+{
+	Rect r;
+	r.x0 = x0 - amount;
+	r.y0 = y0 - amount;
+	r.x1 = safe_add (x1, amount);
+	r.y1 = safe_add (y1, amount);
+	return r;
+}
+
+bool
+Rect::contains (Duple point) const
+{
+	return point.x >= x0 && point.x <= x1 && point.y >= y0 && point.y <= y1;
+}
+
+Rect
+Rect::fix () const
+{
+	Rect r;
+	
+	r.x0 = min (x0, x1);
+	r.y0 = min (y0, y1);
+	r.x1 = max (x0, x1);
+	r.y1 = max (y0, y1);
+
+	return r;
+}
+
+Duple
+ArdourCanvas::operator- (Duple const & o)
+{
+	return Duple (-o.x, -o.y);
+}
+
+Duple
+ArdourCanvas::operator+ (Duple const & a, Duple const & b)
+{
+	return Duple (safe_add (a.x, b.x), safe_add (a.y, b.y));
+}
+
+Duple
+ArdourCanvas::operator- (Duple const & a, Duple const & b)
+{
+	return Duple (a.x - b.x, a.y - b.y);
+}
+
+Duple
+ArdourCanvas::operator/ (Duple const & a, double b)
+{
+	return Duple (a.x / b, a.y / b);
+}
+
+ostream &
+ArdourCanvas::operator<< (ostream & s, Duple const & r)
+{
+	s << "(" << r.x << ", " << r.y << ")";
+	return s;
+}
+
+ostream &
+ArdourCanvas::operator<< (ostream & s, Rect const & r)
+{
+	s << "[(" << r.x0 << ", " << r.y0 << "), (" << r.x1 << ", " << r.y1 << ")]";
+	return s;
+}
+