merge with dev

2018-01-17 10:45:46 +01:00
parent 6b524720c0 f644d41ff2
commit c91d0ace56
5 changed files with 3 additions and 48 deletions
--- a/rtengine/procparams.h
+++ b/rtengine/procparams.h
@@ -291,7 +291,6 @@ struct ToneCurveParams {
    bool operator ==(const ToneCurveParams& other) const;
    bool operator !=(const ToneCurveParams& other) const;

-    static bool HLReconstructionNecessary(const LUTu& histRedRaw, const LUTu& histGreenRaw, const LUTu& histBlueRaw);
 };

 /**