merge with dev

This commit is contained in:
U-PC-BUREAU\jacques
2018-11-01 08:37:28 +01:00
75 changed files with 1248 additions and 378 deletions

View File

@@ -448,12 +448,13 @@ void ImProcCoordinator::updatePreviewImage(int todo, bool panningRelatedChange)
readyphase++;
if ((todo & M_HDR) && params.fattal.enabled) {
if ((todo & M_HDR) && (params.fattal.enabled || params.dehaze.enabled)) {
if (fattal_11_dcrop_cache) {
delete fattal_11_dcrop_cache;
fattal_11_dcrop_cache = nullptr;
}
ipf.dehaze(orig_prev);
ipf.ToneMapFattal02(orig_prev);
if (oprevi != orig_prev) {
@@ -918,7 +919,8 @@ void ImProcCoordinator::updatePreviewImage(int todo, bool panningRelatedChange)
}
ipf.softLight(nprevl);
if (params.colorappearance.enabled) {
//L histo and Chroma histo for ciecam
// histogram well be for Lab (Lch) values, because very difficult to do with J,Q, M, s, C
@@ -1585,7 +1587,8 @@ void ImProcCoordinator::process()
|| params.raw != nextParams.raw
|| params.retinex != nextParams.retinex
|| params.wavelet != nextParams.wavelet
|| params.dirpyrequalizer != nextParams.dirpyrequalizer;
|| params.dirpyrequalizer != nextParams.dirpyrequalizer
|| params.dehaze != nextParams.dehaze;
params = nextParams;
int change = changeSinceLast;