Merge branch 'dev' into newlocallab

2018-07-19 23:07:59 +02:00
parent e65c6786ff d73e5428f9
commit 0780aa0f8f
2038 changed files with 40844 additions and 190177 deletions
--- a/rtengine/procparams.h
+++ b/rtengine/procparams.h
@@ -286,6 +286,7 @@ struct ToneCurveParams {
    int         hlcompr;        // Highlight Recovery's compression
    int         hlcomprthresh;  // Highlight Recovery's threshold
    bool histmatching; // histogram matching
+    bool fromHistMatching;
    bool clampOOG; // clamp out of gamut colours

    ToneCurveParams();
@@ -1656,7 +1657,7 @@ public:
    void clearGeneral();
    int  load(const Glib::ustring& fName);
    void set(bool v);
-    void applyTo(ProcParams* destParams) const ;
+    void applyTo(ProcParams* destParams, bool fromLastSaved = false) const ;

    rtengine::procparams::ProcParams* pparams;
    ParamsEdited* pedited;