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.h
+++ b/rtgui/inspector.h
@@ -21,7 +21,7 @@

 #include <gtkmm.h>
 #include "guiutils.h"
-#include "coord.h"
+#include "../rtengine/coord.h"

 class InspectorBuffer
 {
@@ -42,7 +42,7 @@ class Inspector : public Gtk::DrawingArea
 {

 private:
-    Coord center;
+    rtengine::Coord center;
    std::vector<InspectorBuffer*> images;
    InspectorBuffer* currImage;
    double zoom;