Local adjustments - Normalize luminance - improvment Preview TM - Retinex - Remove D.Range (#6185)

* Enable dynamic range - settings normalize luminance

* Change range DR sigma offset

* improve normalize_mean_dt with mean std before

* Save work on normalize dynamic range

* Improve normalize for TM

* Added LA retinex to normalize_mean

* Clean and optimize code

* Disabled normalize DR - improve TM and Retinex

* Clean code - first part

* Clean code - part two

* Change 2 default values Retinex

* Change order TM and Retinex in process

* remove the order number in - add tool to current spot -

* Fixed bug in TM

* Some change Retinex - default...

* optimize mean sigma

* cleanup for mean_sig

* Fix some cppcheck issues

* convert one large loop into three loops to avoid performance penalty on machines with 4-way L1 cache

Co-authored-by: Ingo Weyrich <heckflosse67@gmx.de>
This commit is contained in:
Desmis
2021-03-28 12:55:29 +02:00
committed by GitHub
parent a64660bfa2
commit 717948cf09
16 changed files with 1274 additions and 1031 deletions

View File

@@ -1287,6 +1287,7 @@ HISTORY_MSG_1039;Local - Grain - gamma
HISTORY_MSG_1040;Local - Spot - soft radius
HISTORY_MSG_1041;Local - Spot - Munsell
HISTORY_MSG_1042;Local - Log encoding - threshold
HISTORY_MSG_1043;Local - Exp - normalize
HISTORY_MSG_BLSHAPE;Blur by level
HISTORY_MSG_BLURCWAV;Blur chroma
HISTORY_MSG_BLURWAV;Blur luminance
@@ -2525,7 +2526,7 @@ TP_LOCALLAB_BLURLEVELFRA;Blur levels
TP_LOCALLAB_BLURMASK_TOOLTIP;Uses a large-radius blur to create a mask that allows you to vary the contrast of the image and/or darken/lighten parts of it.
TP_LOCALLAB_BLURRESIDFRA;Blur Residual
TP_LOCALLAB_BLURRMASK_TOOLTIP;Allows you to vary the "radius" of the Gaussian blur (0 to 1000)
TP_LOCALLAB_BLUR_TOOLNAME;Blur/Grain & Denoise - 1
TP_LOCALLAB_BLUR_TOOLNAME;Blur/Grain & Denoise
TP_LOCALLAB_BLWH;All changes forced in Black-and-White
TP_LOCALLAB_BLWH_TOOLTIP;Force color components "a" and "b" to zero.\nUseful for black and white processing, or film simulation.
TP_LOCALLAB_BUTTON_ADD;Add
@@ -2538,7 +2539,7 @@ TP_LOCALLAB_CBDL;Contrast by Detail Levels
TP_LOCALLAB_CBDLCLARI_TOOLTIP;Enhances local contrast of the midtones.
TP_LOCALLAB_CBDL_ADJ_TOOLTIP;Same as wavelets.\nThe first level (0) acts on 2x2 pixel details.\nThe last level (5) acts on 64x64 pixel details.
TP_LOCALLAB_CBDL_THRES_TOOLTIP;Prevents the sharpening of noise
TP_LOCALLAB_CBDL_TOOLNAME;Contrast by Detail Levels - 2
TP_LOCALLAB_CBDL_TOOLNAME;Contrast by Detail Levels
TP_LOCALLAB_CENTER_X;Center X
TP_LOCALLAB_CENTER_Y;Center Y
TP_LOCALLAB_CH;Curves CL - LC
@@ -2569,7 +2570,7 @@ TP_LOCALLAB_COLORDEPREV_TOOLTIP;Preview ΔE button will only work if you have ac
TP_LOCALLAB_COLORDE_TOOLTIP;Show a blue color-preview for ΔE selection if negative and green if positive.\n\nMask and modifications (show modified areas without mask): show actual modifications if positive, show enhanced modifications (luminance only) with blue and yellow if negative.
TP_LOCALLAB_COLORSCOPE;Scope (color tools)
TP_LOCALLAB_COLORSCOPE_TOOLTIP;Common Scope slider for Color and Light, Shadows/Highlights, Vibrance.\nOther tools have their own scope controls.
TP_LOCALLAB_COLOR_TOOLNAME;Color & Light - 11
TP_LOCALLAB_COLOR_TOOLNAME;Color & Light
TP_LOCALLAB_COL_NAME;Name
TP_LOCALLAB_COL_VIS;Status
TP_LOCALLAB_COMPFRA;Directional contrast
@@ -2681,7 +2682,7 @@ TP_LOCALLAB_EXPRETITOOLS;Advanced Retinex Tools
TP_LOCALLAB_EXPSHARP_TOOLTIP;RT-Spot minimum 39*39.\nUse low transition values and high Transition decay and Scope values to simulate smaller RT-spots.
TP_LOCALLAB_EXPTOOL;Exposure Tools
TP_LOCALLAB_EXPTRC;Tone Response Curve - TRC
TP_LOCALLAB_EXP_TOOLNAME;Dynamic Range & Exposure - 10
TP_LOCALLAB_EXP_TOOLNAME;Dynamic Range & Exposure
TP_LOCALLAB_FATAMOUNT;Amount
TP_LOCALLAB_FATANCHOR;Anchor
TP_LOCALLAB_FATANCHORA;Offset
@@ -2760,7 +2761,7 @@ TP_LOCALLAB_LAPRAD2_TOOLTIP;Smooth radius uses a guided filter to decrease artif
TP_LOCALLAB_LAPRAD_TOOLTIP;Smooth radius uses a guided filter to decrease artifacts and smooth out the transition
TP_LOCALLAB_LAP_MASK_TOOLTIP;Solve PDE for all Laplacian masks.\nIf enabled Laplacian threshold mask reduce artifacts and smooth result.\nIf disabled linear response.
TP_LOCALLAB_LC_FFTW_TOOLTIP;FFT improves quality and allows the use of large radii, but increases processing time (depends on the area to be processed). Preferable to use only for large radii. The size of the area can be reduced by a few pixels to optimize the FFTW. This can reduce the processing time by a factor of 1.5 to 10.
TP_LOCALLAB_LC_TOOLNAME;Local Contrast & Wavelets - 7
TP_LOCALLAB_LC_TOOLNAME;Local Contrast & Wavelets
TP_LOCALLAB_LEVELBLUR;Maximum blur levels
TP_LOCALLAB_LEVELWAV;Ψ Wavelet levels
TP_LOCALLAB_LEVELWAV_TOOLTIP;The Level is automatically adapted to the size of the spot and the preview.\nFrom level 9 size max 512 to level 1 size max = 4
@@ -2817,7 +2818,7 @@ TP_LOCALLAB_LOGSRCGREY_TOOLTIP;Estimated gray point value of the image.
TP_LOCALLAB_LOGSURSOUR_TOOLTIP;Changes tones and colors to take into account the Scene conditions.\n\n<b>Average</b>: Average light environment (standard). The image will not change.\n\n<b>Dim</b>: Dim environment. The image will become slightly bright.
TP_LOCALLAB_LOGTARGGREY_TOOLTIP;You can adjust this value to suit.
TP_LOCALLAB_LOGVIEWING_TOOLTIP;Corresponds to the medium on which the final image will be viewed (monitor, TV, projector, printer,..), as well as its environment.
TP_LOCALLAB_LOG_TOOLNAME;Log Encoding - 0
TP_LOCALLAB_LOG_TOOLNAME;Log Encoding
TP_LOCALLAB_LUM;Curves LL - CC
TP_LOCALLAB_LUMADARKEST;Darkest
TP_LOCALLAB_LUMASK;Background color for luminance mask
@@ -2831,7 +2832,7 @@ TP_LOCALLAB_MASK;Contrast
TP_LOCALLAB_MASK2;Contrast curve
TP_LOCALLAB_MASKCOL;Mask Curves
TP_LOCALLAB_MASKCOM;Common Color Mask
TP_LOCALLAB_MASKCOM_TOOLNAME;Common Color Mask - 13
TP_LOCALLAB_MASKCOM_TOOLNAME;Common Color Mask
TP_LOCALLAB_MASKCOM_TOOLTIP;A tool in its own right.\nCan be used to adjust the image appearance (chrominance, luminance, contrast) and texture as a function of Scope.
TP_LOCALLAB_MASKCURVE_TOOLTIP;The 3 curves are set to 1 (maximum) by default:\nC=f(C) the chroma varies according to the chrominance. You can decrease the chroma to improve the selection. By setting this curve close to zero (with a low value of C to activate the curve) you can desaturate the background in Inverse mode.\nL=f(L) the luminance varies according to the luminance, so you can decrease the brightness to improve the selection.\nL and C = f(H) luminance and chroma vary with hue, so you can decrease luminance and chroma to improve selection
TP_LOCALLAB_MASKDDECAY;Decay strength
@@ -3011,7 +3012,7 @@ TP_LOCALLAB_RETI_LIMDOFFS_TOOLTIP;Adjusts the internal parameters to optimize th
TP_LOCALLAB_RETI_LOGLIN_TOOLTIP;Logarithm mode introduces more contrast but will also generate more halos.
TP_LOCALLAB_RETI_NEIGH_VART_TOOLTIP;The radius and variance sliders allow you adjust haze and target either the foreground or the background.
TP_LOCALLAB_RETI_SCALE_TOOLTIP;If Scale=1, Retinex behaves like local contrast with additional possibilities.\nIncreasing the value of Scale increases the intensity of the recursive action at the expense of processing time.
TP_LOCALLAB_RET_TOOLNAME;Dehaze & Retinex - 9
TP_LOCALLAB_RET_TOOLNAME;Dehaze & Retinex
TP_LOCALLAB_REWEI;Reweighting iterates
TP_LOCALLAB_RGB;RGB Tone Curve
TP_LOCALLAB_RGBCURVE_TOOLTIP;In RGB mode you have 4 choices : Standard, Weighted standard, Luminance & Film-like.
@@ -3048,7 +3049,7 @@ TP_LOCALLAB_SHARDAMPING;Damping
TP_LOCALLAB_SHARFRAME;Modifications
TP_LOCALLAB_SHARITER;Iterations
TP_LOCALLAB_SHARP;Sharpening
TP_LOCALLAB_SHARP_TOOLNAME;Sharpening - 8
TP_LOCALLAB_SHARP_TOOLNAME;Sharpening
TP_LOCALLAB_SHARRADIUS;Radius
TP_LOCALLAB_SHORTC;Short Curves 'L' Mask
TP_LOCALLAB_SHORTCMASK_TOOLTIP;Short circuit the 2 curves L(L) and L(H).\nAllows you to mix the current image with the original image modified by the mask job.\nUsable with masks 2, 3, 4, 6, 7
@@ -3083,7 +3084,7 @@ TP_LOCALLAB_SHOWT;Mask and modifications
TP_LOCALLAB_SHOWVI;Mask and modifications
TP_LOCALLAB_SHRESFRA;Shadows/Highlights
TP_LOCALLAB_SHTRC_TOOLTIP;Based on 'working profile' (only those provided), modifies the tones of the image by acting on a TRC (Tone Response Curve).\nGamma acts mainly on light tones.\nSlope acts mainly on dark tones.\nIt is recommended that the TRC of both devices (monitor and output profile) be sRGB (default).
TP_LOCALLAB_SH_TOOLNAME;Shadows/Highlights & Tone Equalizer - 5
TP_LOCALLAB_SH_TOOLNAME;Shadows/Highlights & Tone Equalizer
TP_LOCALLAB_SIGMAWAV;Attenuation response
TP_LOCALLAB_SIM;Simple
TP_LOCALLAB_SLOMASKCOL;Slope
@@ -3096,7 +3097,7 @@ TP_LOCALLAB_SOFTRADIUSCOL;Soft radius
TP_LOCALLAB_SOFTRADIUSCOL_TOOLTIP;Applies a guided filter to the output image to reduce possible artifacts.
TP_LOCALLAB_SOFTRETI;Reduce ΔE artifacts
TP_LOCALLAB_SOFTRETI_TOOLTIP;Take into account deltaE to improve Transmission map
TP_LOCALLAB_SOFT_TOOLNAME;Soft Light & Original Retinex - 6
TP_LOCALLAB_SOFT_TOOLNAME;Soft Light & Original Retinex
TP_LOCALLAB_SOURCE_ABS;Absolute luminance
TP_LOCALLAB_SOURCE_GRAY;Mean luminance (Yb%)
TP_LOCALLAB_SPECCASE;Specific cases
@@ -3139,7 +3140,7 @@ TP_LOCALLAB_TONEMAPGAM_TOOLTIP;The Gamma slider shifts the tone-mapping effect t
TP_LOCALLAB_TONEMAPREWEI_TOOLTIP;In some cases tone mapping may result in a cartoonish appearance, and in some rare cases soft but wide halos may appear.\n Increasing the number of reweighting iterates will help fight some of these problems.
TP_LOCALLAB_TONEMAP_TOOLTIP;Same as the tone mapping tool in the main menu.\nThe main-menu tool must be deactivated if this tool is used.
TP_LOCALLAB_TONEMASCALE_TOOLTIP;This slider allows you to adjust the transition between "local" and "global" contrast.\nThe greater the value, the larger a detail needs to be for it to be boosted
TP_LOCALLAB_TONE_TOOLNAME;Tone Mapping - 4
TP_LOCALLAB_TONE_TOOLNAME;Tone Mapping
TP_LOCALLAB_TOOLCOL;Structure mask as tool
TP_LOCALLAB_TOOLCOLFRMASK_TOOLTIP;Allows you to modify the mask, if one exists
TP_LOCALLAB_TOOLMASK;Mask Tools
@@ -3158,7 +3159,7 @@ TP_LOCALLAB_USEMASK;Laplacian
TP_LOCALLAB_VART;Variance (contrast)
TP_LOCALLAB_VIBRANCE;Vibrance & Warm/Cool
TP_LOCALLAB_VIBRA_TOOLTIP;Adjusts vibrance (essentially the same as the global adjustment).\nCarries out the equivalent of a white-balance adjustment using a CIECAM algorithm.
TP_LOCALLAB_VIB_TOOLNAME;Vibrance & Warm/Cool - 3
TP_LOCALLAB_VIB_TOOLNAME;Vibrance & Warm/Cool
TP_LOCALLAB_VIS_TOOLTIP;<b>Click</b> to show/hide selected Control Spot.\n<b>Ctrl</b>+<b>click</b> to show/hide all Control Spot.
TP_LOCALLAB_WAMASKCOL;Ψ Mask Wavelet level
TP_LOCALLAB_WARM;Warm/Cool & Color artifacts