summaryrefslogtreecommitdiff
path: root/libs/canvas/xfade_curve.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/xfade_curve.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/xfade_curve.cc')
-rw-r--r--libs/canvas/xfade_curve.cc8
1 files changed, 4 insertions, 4 deletions
diff --git a/libs/canvas/xfade_curve.cc b/libs/canvas/xfade_curve.cc
index e93331e7f9..01a15408ad 100644
--- a/libs/canvas/xfade_curve.cc
+++ b/libs/canvas/xfade_curve.cc
@@ -118,7 +118,7 @@ XFadeCurve::compute_bounding_box () const
_bounding_box = bbox.expand (1.0);
} else {
- _bounding_box = boost::optional<Rect> ();
+ _bounding_box = Rect ();
}
_bounding_box_dirty = false;
@@ -233,10 +233,10 @@ XFadeCurve::render (Rect const & area, Cairo::RefPtr<Cairo::Context> context) co
if (_in.points.size() < 2) { return; }
if (_out.points.size() < 2) { return; }
- Rect self = item_to_window (_bounding_box.get());
- boost::optional<Rect> d = self.intersection (area);
+ Rect self = item_to_window (_bounding_box);
+ Rect d = self.intersection (area);
assert (d);
- Rect draw = d.get ();
+ Rect draw = d;
context->save ();
context->rectangle (draw.x0, draw.y0, draw.width(), draw.height());