Merge windows+cc branch into cairocanvas branch. Not finished, need to now merge...

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

diff --git a/libs/canvas/poly_item.cc b/libs/canvas/poly_item.cc
index 239ae06e186aeba3141877fb5387738094353c24..69afb5ac24b93df1efdd9703080e79cc079ec7fa 100644 (file)
--- a/libs/canvas/poly_item.cc
+++ b/libs/canvas/poly_item.cc
@@ -64,26 +64,28 @@ PolyItem::compute_bounding_box () const
 }
 
 void
-PolyItem::render_path (Rect const & /*area*/, Cairo::RefPtr<Cairo::Context> context) const
+PolyItem::render_path (Rect const & /* area */, Cairo::RefPtr<Cairo::Context> context) const
 {
-       bool done_first = false;
-       for (Points::const_iterator i = _points.begin(); i != _points.end(); ++i) {
-               if (done_first) {
-                       Duple c = item_to_window (Duple (i->x, i->y));
-                       context->line_to (c.x, c.y);
-               } else {
-                       Duple c = item_to_window (Duple (i->x, i->y));
-                       context->move_to (c.x, c.y);
-                       done_first = true;
-               }
+       if (_points.size() < 2) {
+               return;
+       }
+
+       Points::const_iterator i = _points.begin();
+       Duple c (item_to_window (Duple (i->x, i->y)));
+
+       context->move_to (c.x, c.y);
+       ++i;
+
+       while (i != _points.end()) {
+               c = item_to_window (Duple (i->x, i->y));
+               context->line_to (c.x, c.y);
+               ++i;
        }
 }
 
 void
 PolyItem::render_curve (Rect const & area, Cairo::RefPtr<Cairo::Context> context, Points const & first_control_points, Points const & second_control_points) const
 {
-       bool done_first = false;
-
        if (_points.size() <= 2) {
                render_path (area, context);
                return;
@@ -91,26 +93,24 @@ PolyItem::render_curve (Rect const & area, Cairo::RefPtr<Cairo::Context> context
 
        Points::const_iterator cp1 = first_control_points.begin();
        Points::const_iterator cp2 = second_control_points.begin();
+       Points::const_iterator p = _points.begin();
 
-       for (Points::const_iterator i = _points.begin(); i != _points.end(); ++i) {
-
-               if (!done_first) {
+       Duple c = item_to_window (Duple (p->x, p->y));
+       context->move_to (c.x, c.y);
+       ++p;
 
-                       Duple c = item_to_window (Duple (i->x, i->y));
-                       context->move_to (c.x, c.y);
-                       done_first = true;
+       while (p != _points.end()) {
 
-               } else {
+               Duple c1 = item_to_window (Duple (cp1->x, cp1->y));
+               Duple c2 = item_to_window (Duple (cp2->x, cp2->y));
 
-                       Duple c1 = item_to_window (Duple (cp1->x, cp1->y));
-                       Duple c2 = item_to_window (Duple (cp2->x, cp2->y));
-                       Duple c3 = item_to_window (Duple (i->x, i->y));
-
-                       context->curve_to (c1.x, c1.y, c2.x, c2.y, c3.x, c3.y);
-
-                       cp1++;
-                       cp2++;
-               }
+               c = item_to_window (Duple (p->x, p->y));
+               
+               context->curve_to (c1.x, c1.y, c2.x, c2.y, c.x, c.y);
+               
+               ++cp1;
+               ++cp2;
+               ++p;
        }
 }