merge with dev

2018-04-10 18:04:29 +02:00
parent e4d7b278ee 30d7deaee3
commit 431f516583
85 changed files with 785 additions and 2396 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 clampOOG; // clamp out of gamut colours

    ToneCurveParams();