summaryrefslogtreecommitdiff
path: root/libs/canvas/ruler.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/ruler.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/ruler.cc')
-rw-r--r--libs/canvas/ruler.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/libs/canvas/ruler.cc b/libs/canvas/ruler.cc
index f55129662a..9c1f78253f 100644
--- a/libs/canvas/ruler.cc
+++ b/libs/canvas/ruler.cc
@@ -103,13 +103,13 @@ Ruler::render (Rect const & area, Cairo::RefPtr<Cairo::Context> cr) const
}
Rect self (item_to_window (get()));
- boost::optional<Rect> i = self.intersection (area);
+ Rect i = self.intersection (area);
if (!i) {
return;
}
- Rect intersection (i.get());
+ Rect intersection (i);
Distance height = self.height();