Merge branch 'dev' into testoutputprofile

2018-06-14 21:47:14 +02:00
parent 404375e313 5a2e6f5f76
commit e2dc8ea2c3
105 changed files with 3703 additions and 2470 deletions
--- a/rtengine/rtengine.h
+++ b/rtengine/rtengine.h
@@ -490,6 +490,7 @@ public:
    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 void        setSharpMask            (bool sharpMask) = 0;

    virtual ~StagedImageProcessor () {}