synced with master (merged master into gtk3)

This commit is contained in:
Beep6581
2015-10-17 16:23:10 +02:00
98 changed files with 6601 additions and 1473 deletions

View File

@@ -18,14 +18,7 @@
*/
#include "tonecurve.h"
#include "adjuster.h"
// class_slot is no longer part of the sigc++ source tree, but starting from which version ?
#if 1
#include <sigc++/slot.h>
#else
#include <sigc++/class_slot.h>
#endif
#include <iomanip>
#include "ppversion.h"
#include "edit.h"
@@ -859,7 +852,7 @@ void ToneCurve::trimValues (rtengine::procparams::ProcParams* pp)
saturation->trimValue(pp->toneCurve.saturation);
}
void ToneCurve::updateCurveBackgroundHistogram (LUTu & histToneCurve, LUTu & histLCurve, LUTu & histCCurve, /*LUTu & histCLurve, LUTu & histLLCurve,*/ LUTu & histLCAM, LUTu & histCCAM, LUTu & histRed, LUTu & histGreen, LUTu & histBlue, LUTu & histLuma)
void ToneCurve::updateCurveBackgroundHistogram (LUTu & histToneCurve, LUTu & histLCurve, LUTu & histCCurve, /*LUTu & histCLurve, LUTu & histLLCurve,*/ LUTu & histLCAM, LUTu & histCCAM, LUTu & histRed, LUTu & histGreen, LUTu & histBlue, LUTu & histLuma, LUTu & histLRETI)
{
shape->updateBackgroundHistogram (histToneCurve);