From 621887cfaac4bef4b6849037c0d72f7e7b66fa03 Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Fri, 7 Mar 2014 11:24:51 -0500 Subject: [PATCH] slightly optimize bounding box computation for ArdourCanvas::PolyItem by avoiding inner conditional --- libs/canvas/poly_item.cc | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/libs/canvas/poly_item.cc b/libs/canvas/poly_item.cc index 3b2e2efad9..eeb186fd7f 100644 --- a/libs/canvas/poly_item.cc +++ b/libs/canvas/poly_item.cc @@ -37,27 +37,28 @@ PolyItem::PolyItem (Group* parent) void PolyItem::compute_bounding_box () const { - bool have_one = false; - Rect bbox; + + if (!_points.empty()) { - for (Points::const_iterator i = _points.begin(); i != _points.end(); ++i) { - if (have_one) { + Rect bbox; + Points::const_iterator i = _points.begin(); + + bbox.x0 = bbox.x1 = i->x; + bbox.y0 = bbox.y1 = i->y; + + while (i != _points.end()) { bbox.x0 = min (bbox.x0, i->x); bbox.y0 = min (bbox.y0, i->y); bbox.x1 = max (bbox.x1, i->x); bbox.y1 = max (bbox.y1, i->y); - } else { - bbox.x0 = bbox.x1 = i->x; - bbox.y0 = bbox.y1 = i->y; - have_one = true; + ++i; } - } - - if (!have_one) { - _bounding_box = boost::optional (); - } else { _bounding_box = bbox.expand (_outline_width / 2); + + + } else { + _bounding_box = boost::optional (); } _bounding_box_dirty = false;