diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2017-01-19 20:54:24 +0100 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2017-01-19 20:54:54 +0100 |
| commit | 4fa4b9a1359131d861470376a34750211cf1a1ae (patch) | |
| tree | 83d0395d654f9225c258456aa9e68b3ab334f945 /libs/canvas/text.cc | |
| parent | 758f183b99dadd173cc5b0f8b9e76f6cc3e02159 (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/text.cc')
| -rw-r--r-- | libs/canvas/text.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libs/canvas/text.cc b/libs/canvas/text.cc index 735b9b87f8..5c3487f01d 100644 --- a/libs/canvas/text.cc +++ b/libs/canvas/text.cc @@ -195,7 +195,7 @@ Text::render (Rect const & area, Cairo::RefPtr<Cairo::Context> context) const } Rect self = item_to_window (Rect (0, 0, min (_clamped_width, (double)_image->get_width ()), _image->get_height ())); - boost::optional<Rect> i = self.intersection (area); + Rect i = self.intersection (area); if (!i) { return; @@ -205,7 +205,7 @@ Text::render (Rect const & area, Cairo::RefPtr<Cairo::Context> context) const _redraw (); } - Rect intersection (i.get()); + Rect intersection (i); context->rectangle (intersection.x0, intersection.y0, intersection.width(), intersection.height()); #ifdef __APPLE__ @@ -238,7 +238,7 @@ void Text::compute_bounding_box () const { if (!_canvas || _text.empty()) { - _bounding_box = boost::optional<Rect> (); + _bounding_box = Rect (); _bounding_box_dirty = false; return; } |