From 516e05fa6138cb722a976e047ba66f6fe0ba839b Mon Sep 17 00:00:00 2001 From: Desmis Date: Mon, 29 Apr 2019 07:45:26 +0200 Subject: [PATCH] Suppress grey image when chnanging Clarity --- rtengine/cplx_wavelet_filter_coeffs.h | 6 +++++- rtengine/dcrop.cc | 5 +++++ rtengine/improccoordinator.cc | 5 +++++ 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/rtengine/cplx_wavelet_filter_coeffs.h b/rtengine/cplx_wavelet_filter_coeffs.h index bd333d4b9..629bbe659 100644 --- a/rtengine/cplx_wavelet_filter_coeffs.h +++ b/rtengine/cplx_wavelet_filter_coeffs.h @@ -49,6 +49,10 @@ const float Daub4_anal16[2][16] ALIGNED16 = {//Daub 14 { -0.0002501134f, -0.0012739524f, -0.0003037575f, 0.008874895f, 0.01171997f , -0.026891225f, -0.057001725f, 0.05042335f, 0.158417505f, -0.10175691f, -0.33218624f, 0.515574245f, -0.28039564f, 0.055049715f, 0.f, 0.f} }; -// if necessary ?? we can add D20 !! +const float Daub4_anal22[2][22] ALIGNED16 = {//Daub 20 + {0.f, 0.f, 0.01885858f, 0.13306109f, 0.37278754f, 0.48681406f, 0.19881887f, -0.1766681f, -0.13855494f, 0.09006372f, 0.0658015f, -0.05048328f, -0.02082962f, 0.0234849f, 0.002550222f, -0.0075895, 0.0009866627f, 0.001408843f, -0.0004849739f, -0.0000823545f, 0.00006617734f, -0.0000093792f}, + {0.0000093792f, -0.00006617734f, 0.0000823545f, 0.0004849739f, -0.001408843f, -0.0009866627f, 0.0075895, -0.002550222f, -0.0234849f, 0.02082962f, 0.05048328f, -0.0658015f, -0.09006372f, 0.13855494f, 0.1766681f, -0.19881887f, -0.48681406f, -0.37278754f, -0.13306109f, -0.01885858f, 0.f, 0.f} +}; + } diff --git a/rtengine/dcrop.cc b/rtengine/dcrop.cc index c13831468..4550eac52 100644 --- a/rtengine/dcrop.cc +++ b/rtengine/dcrop.cc @@ -1018,6 +1018,11 @@ void Crop::update(int todo) } + if (!WaveParams.expclari && WaveParams.CLmethod != "all") { + params.wavelet.CLmethod = "all"; + params.wavelet.Backmethod = "grey"; + } + parent->ipf.ip_wavelet(labnCrop, labnCrop, kall, WaveParams, wavCLVCurve, waOpacityCurveRG, waOpacityCurveBY, waOpacityCurveW, waOpacityCurveWL, parent->wavclCurve, skip); if ((WaveParams.ushamethod == "sharp" || WaveParams.ushamethod == "clari") && WaveParams.expclari && WaveParams.CLmethod != "all") { diff --git a/rtengine/improccoordinator.cc b/rtengine/improccoordinator.cc index 2790f93a2..c64fe9746 100644 --- a/rtengine/improccoordinator.cc +++ b/rtengine/improccoordinator.cc @@ -882,6 +882,11 @@ void ImProcCoordinator::updatePreviewImage(int todo, bool panningRelatedChange) } + if (!WaveParams.expclari && WaveParams.CLmethod != "all") { + params->wavelet.CLmethod = "all"; + params->wavelet.Backmethod = "grey"; + } + ipf.ip_wavelet(nprevl, nprevl, kall, WaveParams, wavCLVCurve, waOpacityCurveRG, waOpacityCurveBY, waOpacityCurveW, waOpacityCurveWL, wavclCurve, scale); if ((WaveParams.ushamethod == "sharp" || WaveParams.ushamethod == "clari") && WaveParams.expclari && WaveParams.CLmethod != "all") {