Use a C++ bool constant

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

diff --git a/libs/canvas/polygon.cc b/libs/canvas/polygon.cc
index d84bca4af6b1770ded6180f501c491afc8814264..53fea1c5f4f9bdacaa419f0e7270c20d2b95ff1e 100644 (file)
--- a/libs/canvas/polygon.cc
+++ b/libs/canvas/polygon.cc
@@ -29,8 +29,8 @@ Polygon::Polygon (Canvas* c)
 {
 }
 
-Polygon::Polygon (Group* g)
-       : PolyItem (g)
+Polygon::Polygon (Item* parent)
+       : PolyItem (parent)
        , multiple (0)
        , constant (0)
        , cached_size (0)
@@ -48,11 +48,11 @@ Polygon::render (Rect const & area, Cairo::RefPtr<Cairo::Context> context) const
 {
        if (_outline || _fill) {
                render_path (area, context);
-               
+
                if (!_points.empty ()) {
                        /* close path */
                        Duple p = item_to_window (Duple (_points.front().x, _points.front().y));
-                       context->move_to (p.x, p.y);
+                       context->line_to (p.x, p.y);
                }
 
        }
@@ -72,7 +72,7 @@ Polygon::render (Rect const & area, Cairo::RefPtr<Cairo::Context> context) const
        }
 }
 
-void 
+void
 Polygon::cache_shape_computation () const
 {
        Points::size_type npoints = _points.size();
@@ -95,17 +95,17 @@ Polygon::cache_shape_computation () const
        for (i = 0; i < npoints; i++) {
                if (_points[j].y == _points[i].y) {
                        constant[i] = _points[i].x;
-                       multiple[i] = 0; 
+                       multiple[i] = 0;
                } else {
                        constant[i] = _points[i].x-(_points[i].y*_points[j].x)/(_points[j].y-_points[i].y)+(_points[i].y*_points[i].x)/(_points[j].y-_points[i].y);
-                       multiple[i] = (_points[j].x-_points[i].x)/(_points[j].y-_points[i].y); 
+                       multiple[i] = (_points[j].x-_points[i].x)/(_points[j].y-_points[i].y);
                }
 
-               j = i; 
+               j = i;
        }
 }
 
-bool 
+bool
 Polygon::covers (Duple const & point) const
 {
        Duple p = window_to_item (point);
@@ -119,20 +119,20 @@ Polygon::covers (Duple const & point) const
        Points::size_type i;
        Points::size_type j = npoints -1;
        bool oddNodes = false;
-       
+
        if (_bounding_box_dirty) {
                compute_bounding_box ();
        }
-       
+
        for (i = 0; i < npoints; i++) {
                if (((_points[i].y < p.y && _points[j].y >= p.y) || (_points[j].y < p.y && _points[i].y >= p.y))) {
-                       oddNodes ^= (p.y * multiple[i] + constant[i] < p.x); 
+                       oddNodes ^= (p.y * multiple[i] + constant[i] < p.x);
                }
-               j = i; 
+               j = i;
        }
 
-       return oddNodes; 
-} 
+       return oddNodes;
+}
 
 void
 Polygon::compute_bounding_box () const