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/improccoordinator.h
+++ b/rtengine/improccoordinator.h
@@ -81,6 +81,7 @@ protected:
    RenderingIntent monitorIntent;
    bool softProof;
    bool gamutCheck;
+    bool sharpMask;

    int scale;
    bool highDetailPreprocessComputed;
@@ -466,8 +467,7 @@ public:
    void getMonitorProfile(Glib::ustring& profile, RenderingIntent& intent) const;
    void setSoftProofing(bool softProof, bool gamutCheck);
    void getSoftProofing(bool &softProof, bool &gamutCheck);
-//>>>>>>> dev
-
+    void setSharpMask      (bool sharpMask);
    bool updateTryLock()
    {
        return updaterThreadStart.trylock();