Forward un/map events to NSGLView

[ardour.git] / libs / canvas / image.cc

diff --git a/libs/canvas/image.cc b/libs/canvas/image.cc
index d6c42d28ef9856b8eeafc3b0523891d5bcf28c15..fc22af8556f9344a0facfffb855bd125e4477526 100644 (file)
--- a/libs/canvas/image.cc
+++ b/libs/canvas/image.cc
@@ -53,13 +53,13 @@ Image::render (Rect const& area, Cairo::RefPtr<Cairo::Context> context) const
                                                        _pending->stride);
                _current = _pending;
        }
-       
+
        Rect self = item_to_window (Rect (0, 0, _width, _height));
-       boost::optional<Rect> draw = self.intersection (area);
+       Rect draw = self.intersection (area);
 
        if (_surface && draw) {
                context->set_source (_surface, 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 ();
        }
 }
@@ -67,7 +67,7 @@ Image::render (Rect const& area, Cairo::RefPtr<Cairo::Context> context) const
 void
 Image::compute_bounding_box () const
 {
-       _bounding_box = boost::optional<Rect> (Rect (0, 0, _width, _height));
+       _bounding_box = Rect (0, 0, _width, _height);
        _bounding_box_dirty = false;
 }
 
@@ -103,5 +103,5 @@ Image::accept_data ()
        begin_change ();
        _need_render = true;
        end_change (); // notify canvas that we need redrawing
-}      
+}