Merge branch 'dev' into testoutputprofile

2018-07-22 03:25:49 +02:00
parent bbde907d72 3bfd903dc7
commit 3a6556404a
2033 changed files with 40818 additions and 190141 deletions
--- a/rtengine/procparams.h
+++ b/rtengine/procparams.h
@@ -281,6 +281,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();
@@ -1514,7 +1515,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;