Merge branch 'master' into gtk3

2015-08-20 23:46:29 +02:00
parent 956213df65 d4c808efd6
commit 5a9531b353
15 changed files with 618 additions and 228 deletions
--- a/rtgui/inspector.cc
+++ b/rtgui/inspector.cc
@@ -115,10 +115,10 @@ bool Inspector::on_draw(const ::Cairo::RefPtr< Cairo::Context> &cr)
        // this will eventually create/update the off-screen pixmap

        // compute the displayed area
-        Coord availableSize;
-        Coord topLeft;
-        Coord displayedSize;
-        Coord dest(0, 0);
+        rtengine::Coord availableSize;
+        rtengine::Coord topLeft;
+        rtengine::Coord displayedSize;
+        rtengine::Coord dest(0, 0);
        availableSize.x = win->get_width();
        availableSize.y = win->get_height();
        int imW = currImage->imgBuffer.getWidth();