Merge branch 'master' into clang-tidy

2016-10-18 17:48:50 +02:00
parent f9f4fe9035 cced5756cb
commit 0bbc84b2af
85 changed files with 6870 additions and 2817 deletions
--- a/rtengine/rtengine.h
+++ b/rtengine/rtengine.h
@@ -418,6 +418,8 @@ public:

    virtual void        setMonitorProfile       (const Glib::ustring& monitorProfile, RenderingIntent intent) = 0;
    virtual void        getMonitorProfile       (Glib::ustring& monitorProfile, RenderingIntent& intent) const = 0;
+    virtual void        setSoftProofing         (bool softProof, bool gamutCheck) = 0;
+    virtual void        getSoftProofing         (bool &softProof, bool &gamutCheck) = 0;

    virtual ~StagedImageProcessor () {}