merge with dev

2018-01-22 08:56:24 +01:00
parent 6cdbba2a0f 5342e75289
commit cef451807d
35 changed files with 1066 additions and 47 deletions
--- a/rtengine/procparams.h
+++ b/rtengine/procparams.h
@@ -285,6 +285,7 @@ struct ToneCurveParams {
    int         shcompr;
    int         hlcompr;        // Highlight Recovery's compression
    int         hlcomprthresh;  // Highlight Recovery's threshold
+    bool histmatching; // histogram matching

    ToneCurveParams();