projects
/
ardour.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
170aee1
)
slightly optimize bounding box computation for ArdourCanvas::PolyItem by avoiding...
author
Paul Davis
<paul@linuxaudiosystems.com>
Fri, 7 Mar 2014 16:24:51 +0000
(11:24 -0500)
committer
Paul Davis
<paul@linuxaudiosystems.com>
Fri, 7 Mar 2014 16:24:51 +0000
(11:24 -0500)
libs/canvas/poly_item.cc
patch
|
blob
|
history
diff --git
a/libs/canvas/poly_item.cc
b/libs/canvas/poly_item.cc
index 3b2e2efad9a8dafc1760e4c75eaad4e267ae4437..eeb186fd7fcf556bcd901ef7f2ac7c6542d5f400 100644
(file)
--- 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
{
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);
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;
}
}
- }
+ _bounding_box = bbox.expand (_outline_width / 2);
- if (!have_one) {
- _bounding_box = boost::optional<Rect> ();
+
} else {
} else {
- _bounding_box = b
box.expand (_outline_width / 2
);
+ _bounding_box = b
oost::optional<Rect> (
);
}
_bounding_box_dirty = false;
}
_bounding_box_dirty = false;