summaryrefslogtreecommitdiff
path: root/libs/canvas/line_set.cc
diff options
context:
space:
mode:
authorPaul Davis <paul@linuxaudiosystems.com>2017-01-19 20:54:24 +0100
committerPaul Davis <paul@linuxaudiosystems.com>2017-01-19 20:54:54 +0100
commit4fa4b9a1359131d861470376a34750211cf1a1ae (patch)
tree83d0395d654f9225c258456aa9e68b3ab334f945 /libs/canvas/line_set.cc
parent758f183b99dadd173cc5b0f8b9e76f6cc3e02159 (diff)
remove use of boost::optional to define "undefined" Canvas::Rect, and use Rect::empty instead.
This commit includes Rect::operator bool() which might be a candidate for removal in a future commit, in an attempt to make the meaning clearer
Diffstat (limited to 'libs/canvas/line_set.cc')
-rw-r--r--libs/canvas/line_set.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/libs/canvas/line_set.cc b/libs/canvas/line_set.cc
index 03f2f0abf1..0c225789ab 100644
--- a/libs/canvas/line_set.cc
+++ b/libs/canvas/line_set.cc
@@ -50,7 +50,7 @@ void
LineSet::compute_bounding_box () const
{
if (_lines.empty ()) {
- _bounding_box = boost::optional<Rect> ();
+ _bounding_box = Rect ();
} else {
if (_orientation == Horizontal) {
@@ -100,13 +100,13 @@ LineSet::render (Rect const & area, Cairo::RefPtr<Cairo::Context> context) const
self = item_to_window (Rect (i->pos - (i->width/2.0), 0, i->pos + (i->width/2.0), _extent));
}
- boost::optional<Rect> isect = self.intersection (area);
+ Rect isect = self.intersection (area);
if (!isect) {
continue;
}
- Rect intersection (isect.get());
+ Rect intersection (isect);
set_source_rgba (context, i->color);
context->set_line_width (i->width);