merge with dev

2018-02-06 16:54:30 +01:00
parent 94eeb923ea e6265cdfef
commit 40cc22f1e1
42 changed files with 576 additions and 255 deletions
--- a/rtengine/rtengine.h
+++ b/rtengine/rtengine.h
@@ -451,6 +451,9 @@ public:
      * @return the height of the preview image */
    virtual int         getPreviewHeight () = 0;

+    virtual bool        getHighQualComputed() = 0;
+    virtual void        setHighQualComputed() = 0;
+
    virtual bool        updateTryLock() = 0;

    virtual void        updateUnLock() = 0;