Merge branch 'master' into gtk3

This commit is contained in:
Morgan Hardwood
2016-10-11 22:08:49 +02:00
3 changed files with 11 additions and 37 deletions

View File

@@ -753,13 +753,13 @@ void WaveletParams::setDefaults()
hhcurve.push_back(FCT_Linear);
Chcurve.clear ();
Chcurve.push_back(FCT_Linear);
expcontrast = true;
expchroma = true;
expedge = true;
expresid = true;
expfinal = true;
exptoning = true;
expnoise = true;
expcontrast = false;
expchroma = false;
expedge = false;
expresid = false;
expfinal = false;
exptoning = false;
expnoise = false;
for(int i = 0; i < 9; i ++) {
c[i] = 0;