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/stateful_image.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/stateful_image.cc')
| -rw-r--r-- | libs/canvas/stateful_image.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libs/canvas/stateful_image.cc b/libs/canvas/stateful_image.cc index fe669dc68d..3242ab7b80 100644 --- a/libs/canvas/stateful_image.cc +++ b/libs/canvas/stateful_image.cc @@ -45,7 +45,7 @@ StatefulImage::render (Rect const & area, Cairo::RefPtr<Cairo::Context> context) ImageHandle image = _states[_state].image; Rect self = item_to_window (Rect (0, 0, image->get_width(), image->get_height())); - boost::optional<Rect> draw = self.intersection (area); + Rect draw = self.intersection (area); if (!draw) { return; @@ -55,7 +55,7 @@ StatefulImage::render (Rect const & area, Cairo::RefPtr<Cairo::Context> context) ("window" coordinates) and render it. */ context->set_source (image, self.x0, self.y0); - context->rectangle (draw->x0, draw->y0, draw->width(), draw->height()); + context->rectangle (draw.x0, draw.y0, draw.width(), draw.height()); context->fill (); if (!_text.empty()) { |