merge with dev..

2018-06-14 09:06:29 +02:00
parent 03fb04cd81 e3cb9130a1
commit c1463c7edd
87 changed files with 1674 additions and 790 deletions
--- a/rtengine/rtengine.h
+++ b/rtengine/rtengine.h
@@ -494,6 +494,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 () {}