merge with dev

2019-03-11 10:08:54 +01:00
parent d62acb0eaf 28bf4f0d91
commit 040e900c02
19 changed files with 322 additions and 125 deletions
--- a/rtgui/options.h
+++ b/rtgui/options.h
@@ -314,7 +314,12 @@ public:
    bool filledProfile;  // Used as reminder for the ProfilePanel "mode"
    prevdemo_t prevdemo; // Demosaicing method used for the <100% preview
    bool serializeTiffRead;
-
+    bool measure;
+    size_t chunkSizeAMAZE;
+    size_t chunkSizeCA;
+    size_t chunkSizeRCD;
+    size_t chunkSizeRGB;
+    size_t chunkSizeXT;
    bool menuGroupRank;
    bool menuGroupLabel;
    bool menuGroupFileOperations;