Merge branch 'dev' into newlocallab

2019-11-04 23:01:33 +01:00
parent 91b80b23d2 ec5eaf9cea
commit 033d9fe02a
395 changed files with 2523 additions and 2740 deletions
--- a/rtgui/imagearea.cc
+++ b/rtgui/imagearea.cc
@@ -25,6 +25,7 @@
 #include "../rtengine/refreshmap.h"
 #include "../rtengine/procparams.h"
 #include "options.h"
+#include "rtscalable.h"

 ImageArea::ImageArea (ImageAreaPanel* p) : parent(p), fullImageWidth(0), fullImageHeight(0)
 {