merge with dev

This commit is contained in:
Desmis
2017-06-27 10:28:35 +02:00
45 changed files with 1074 additions and 400 deletions

View File

@@ -3519,7 +3519,8 @@ SSEFUNCTION void ImProcFunctions::RGB_denoise_info(Imagefloat * src, Imagefloat
bdecomp = new wavelet_decomposition (labdn->data + 2 * datalen, labdn->W, labdn->H, levwav, 1);
}
}
bool autoch = dnparams.autochroma;
const bool autoch = (settings->leveldnautsimpl == 1 && (dnparams.Cmethod == "AUT" || dnparams.Cmethod == "PRE")) || (settings->leveldnautsimpl == 0 && (dnparams.C2method == "AUTO" || dnparams.C2method == "PREV"));
if (comptlevel == 0) {
WaveletDenoiseAll_info(