merge with dev

2018-04-11 13:08:28 +02:00
parent 450f6ecf09 ea94d74f9d
commit 62fc062712
86 changed files with 1758 additions and 3510 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 clampOOG; // clamp out of gamut colours

    ToneCurveParams();