From b22a8a8e0ef674604f00770a7adec39f280c747a Mon Sep 17 00:00:00 2001 From: michael Date: Fri, 18 Nov 2011 17:28:44 -0500 Subject: [PATCH] Enhancement to Auto Levels on behalf of Emil; Replacements of the packaged profiles. (see issue 940) --- rtdata/profiles/BW-1.pp3 | 73 ++++---- rtdata/profiles/BW-2.pp3 | 71 ++++---- rtdata/profiles/Natural-1.pp3 | 73 ++++---- rtdata/profiles/Natural-2.pp3 | 73 ++++---- rtdata/profiles/Punchy-0.pp3 | 230 ------------------------- rtdata/profiles/Punchy-1.pp3 | 92 +++++----- rtdata/profiles/Punchy-2.pp3 | 94 +++++----- rtdata/profiles/Tuned-1.pp3 | 73 ++++---- rtdata/profiles/Tuned-2.pp3 | 230 ------------------------- rtdata/profiles/Tuned-3.pp3 | 230 ------------------------- rtdata/profiles/default-ISO-high.pp3 | 63 +++---- rtdata/profiles/default-ISO-medium.pp3 | 63 +++---- rtdata/profiles/default.pp3 | 61 +++---- rtdata/profiles/neutral.pp3 | 49 +++--- rtengine/curves.cc | 10 +- rtengine/improccoordinator.cc | 13 +- rtengine/improcfun.cc | 163 +++++++++++++++--- rtengine/improcfun.h | 2 +- rtengine/procparams.cc | 8 +- rtengine/rtengine.h | 8 +- rtengine/rtthumbnail.cc | 31 +++- rtengine/simpleprocess.cc | 19 +- rtgui/ppversion.h | 3 +- rtgui/tonecurve.cc | 28 ++- rtgui/tonecurve.h | 6 +- 25 files changed, 584 insertions(+), 1182 deletions(-) delete mode 100644 rtdata/profiles/Punchy-0.pp3 delete mode 100644 rtdata/profiles/Tuned-2.pp3 delete mode 100644 rtdata/profiles/Tuned-3.pp3 diff --git a/rtdata/profiles/BW-1.pp3 b/rtdata/profiles/BW-1.pp3 index 131a78153..9e33387a2 100644 --- a/rtdata/profiles/BW-1.pp3 +++ b/rtdata/profiles/BW-1.pp3 @@ -1,7 +1,7 @@ [Version] -AppVersion=Dev-3.1m6.89 -Version=300 +AppVersion=4.0.5.7 +Version=301 [General] Rank=0 @@ -10,16 +10,16 @@ InTrash=false [Exposure] Auto=true -Clip=0.0005 +Clip=0 Compensation=0 -Brightness=8 -Contrast=0 +Brightness=0 +Contrast=20 Saturation=0 Black=0 -HighlightCompr=70 -HighlightComprThreshold=30 +HighlightCompr=0 +HighlightComprThreshold=33 ShadowCompr=50 -Curve=0; +Curve=1;0;0;0.040000000000000015;0.029999999999999995;0.17684498029510265;0.21732319394192093;0.70232558139534862;0.74883720930232545;1;1; [Channel Mixer] Red=100;0;0; @@ -28,12 +28,12 @@ Blue=0;0;100; [Luminance Curve] Brightness=0 -Contrast=5 +Contrast=0 Saturation=-100 AvoidColorClipping=false SaturationLimiter=false SaturationLimit=40 -LCurve=2;0.25;0.5;0.75;50;12;-12;-50; +LCurve=0; aCurve=0; bCurve=0; @@ -53,15 +53,17 @@ DeconvAmount=75 DeconvDamping=20 DeconvIterations=30 -[Clarity] +[SharpenEdge] +Enabled=false +Passes=2 +Strength=50 +ThreeChannels=false + +[SharpenMicro] Enabled=false -Clpasses=2 -Clstrength=50 -Clthreechannels=false -Enabledtwo=false -Mlstrength=20 -Uniformity=50 Matrix=false +Strength=20 +Uniformity=50 [Color Boost] Amount=0 @@ -71,8 +73,8 @@ SaturationLimit=75 [White Balance] Setting=Camera -Temperature=5435 -Green=1.0619999999999992 +Temperature=5000 +Green=1 [Color Shift] ChannelA=0 @@ -89,8 +91,8 @@ Threshold=25 [Directional Pyramid Denoising] Enabled=false -Luma=10 -Chroma=10 +Luma=5 +Chroma=5 Gamma=2 LumCurve=0; ChromCurve=0; @@ -118,8 +120,8 @@ Radius=30 Enabled=false X=0 Y=0 -W=4276 -H=2836 +W=4281 +H=2871 FixedRatio=false Ratio=3:2 Orientation=Landscape @@ -131,7 +133,7 @@ HorizontalFlip=false VerticalFlip=false [Common Properties for Transformations] -AutoFill=true +AutoFill=false [Rotation] Degree=0 @@ -156,8 +158,8 @@ CenterX=0 CenterY=0 [HLRecovery] -Enabled=true -Method=Luminance +Enabled=false +Method=Blend [Resize] Enabled=false @@ -165,12 +167,12 @@ Scale=1 AppliesTo=Cropped area Method=Bicubic DataSpecified=0 -Width=4276 -Height=2836 +Width=4281 +Height=2871 [Color Management] InputProfile=(camera) -ApplyGammaBeforeInputProfile=false +BlendCMSMatrix=false WorkingProfile=ProPhoto OutputProfile=No ICM: sRGB output Gammafree=default @@ -178,17 +180,6 @@ Freegamma=false GammaValue=2.22 GammaSlope=4.5 -[Equalizer] -Enabled=false -C0=0 -C1=0 -C2=0 -C3=0 -C4=0 -C5=0 -C6=0 -C7=0 - [Directional Pyramid Equalizer] Enabled=true Mult0=3 @@ -209,7 +200,7 @@ FlatFieldFile= FlatFieldAutoSelect=false FlatFieldBlurRadius=32 FlatFieldBlurType=Area Flatfield -CA=true +CA=false CARed=0 CABlue=0 HotDeadPixels=false diff --git a/rtdata/profiles/BW-2.pp3 b/rtdata/profiles/BW-2.pp3 index dd72c84b2..18de65898 100644 --- a/rtdata/profiles/BW-2.pp3 +++ b/rtdata/profiles/BW-2.pp3 @@ -1,7 +1,7 @@ [Version] -AppVersion=Dev-3.1m6.89 -Version=300 +AppVersion=4.0.5.7 +Version=301 [General] Rank=0 @@ -10,16 +10,16 @@ InTrash=false [Exposure] Auto=true -Clip=0.0005 +Clip=0 Compensation=0 -Brightness=8 -Contrast=0 +Brightness=0 +Contrast=20 Saturation=0 Black=0 -HighlightCompr=70 -HighlightComprThreshold=30 +HighlightCompr=0 +HighlightComprThreshold=33 ShadowCompr=50 -Curve=0; +Curve=1;0;0;0.45754265471370759;0.57906737998843294;1;1; [Channel Mixer] Red=100;0;0; @@ -28,12 +28,12 @@ Blue=0;0;100; [Luminance Curve] Brightness=0 -Contrast=5 +Contrast=0 Saturation=-100 AvoidColorClipping=false SaturationLimiter=false SaturationLimit=40 -LCurve=3;0;0;0.18623481781376497;0.028340080971659902;0.50607287449392713;0.50607287449392713;0.77732793522267185;0.97975708502024295;1;1; +LCurve=3;0;0;0.84892086330935235;0.69064748201438808;1;1; aCurve=0; bCurve=0; @@ -53,15 +53,17 @@ DeconvAmount=75 DeconvDamping=20 DeconvIterations=30 -[Clarity] +[SharpenEdge] +Enabled=false +Passes=2 +Strength=50 +ThreeChannels=false + +[SharpenMicro] Enabled=false -Clpasses=2 -Clstrength=50 -Clthreechannels=false -Enabledtwo=false -Mlstrength=20 -Uniformity=50 Matrix=false +Strength=20 +Uniformity=50 [Color Boost] Amount=0 @@ -72,7 +74,7 @@ SaturationLimit=75 [White Balance] Setting=Camera Temperature=5000 -Green=1.0 +Green=1 [Color Shift] ChannelA=0 @@ -89,8 +91,8 @@ Threshold=25 [Directional Pyramid Denoising] Enabled=false -Luma=10 -Chroma=10 +Luma=5 +Chroma=5 Gamma=2 LumCurve=0; ChromCurve=0; @@ -118,8 +120,8 @@ Radius=30 Enabled=false X=0 Y=0 -W=4276 -H=2836 +W=4281 +H=2871 FixedRatio=false Ratio=3:2 Orientation=Landscape @@ -131,7 +133,7 @@ HorizontalFlip=false VerticalFlip=false [Common Properties for Transformations] -AutoFill=true +AutoFill=false [Rotation] Degree=0 @@ -156,8 +158,8 @@ CenterX=0 CenterY=0 [HLRecovery] -Enabled=true -Method=Luminance +Enabled=false +Method=Blend [Resize] Enabled=false @@ -165,12 +167,12 @@ Scale=1 AppliesTo=Cropped area Method=Bicubic DataSpecified=0 -Width=4276 -Height=2836 +Width=4281 +Height=2871 [Color Management] InputProfile=(camera) -ApplyGammaBeforeInputProfile=false +BlendCMSMatrix=false WorkingProfile=ProPhoto OutputProfile=No ICM: sRGB output Gammafree=default @@ -178,17 +180,6 @@ Freegamma=false GammaValue=2.22 GammaSlope=4.5 -[Equalizer] -Enabled=false -C0=0 -C1=0 -C2=0 -C3=0 -C4=0 -C5=0 -C6=0 -C7=0 - [Directional Pyramid Equalizer] Enabled=true Mult0=3 @@ -209,7 +200,7 @@ FlatFieldFile= FlatFieldAutoSelect=false FlatFieldBlurRadius=32 FlatFieldBlurType=Area Flatfield -CA=true +CA=false CARed=0 CABlue=0 HotDeadPixels=false diff --git a/rtdata/profiles/Natural-1.pp3 b/rtdata/profiles/Natural-1.pp3 index dcbea30d7..9b0eaecd9 100644 --- a/rtdata/profiles/Natural-1.pp3 +++ b/rtdata/profiles/Natural-1.pp3 @@ -1,7 +1,7 @@ [Version] -AppVersion=Dev-3.1m6.89 -Version=300 +AppVersion=4.0.5.7 +Version=301 [General] Rank=0 @@ -10,16 +10,16 @@ InTrash=false [Exposure] Auto=true -Clip=0.0005 +Clip=0 Compensation=0 Brightness=0 -Contrast=0 +Contrast=20 Saturation=0 Black=0 -HighlightCompr=70 -HighlightComprThreshold=30 +HighlightCompr=0 +HighlightComprThreshold=33 ShadowCompr=50 -Curve=0; +Curve=1;0;0;0.040000000000000015;0.029999999999999995;0.17684498029510265;0.21732319394192093;0.70232558139534862;0.74883720930232545;1;1; [Channel Mixer] Red=100;0;0; @@ -27,13 +27,13 @@ Green=0;100;0; Blue=0;0;100; [Luminance Curve] -Brightness=-10 -Contrast=-20 -Saturation=15 +Brightness=0 +Contrast=0 +Saturation=0 AvoidColorClipping=false SaturationLimiter=false SaturationLimit=40 -LCurve=3;0;0;0.04270462633451956;0.01423487544483986;0.23843416370106757;0.17437722419928825;0.48042704626334531;0.44128113879003594;0.62989323843416389;0.69039145907473343;0.72953736654804269;0.83274021352313166;0.86120996441281117;0.95729537366548023;1;1; +LCurve=0; aCurve=0; bCurve=0; @@ -53,15 +53,17 @@ DeconvAmount=75 DeconvDamping=20 DeconvIterations=30 -[Clarity] +[SharpenEdge] +Enabled=false +Passes=2 +Strength=50 +ThreeChannels=false + +[SharpenMicro] Enabled=false -Clpasses=2 -Clstrength=50 -Clthreechannels=false -Enabledtwo=false -Mlstrength=20 -Uniformity=50 Matrix=false +Strength=20 +Uniformity=50 [Color Boost] Amount=0 @@ -72,7 +74,7 @@ SaturationLimit=75 [White Balance] Setting=Camera Temperature=5000 -Green=1.0 +Green=1 [Color Shift] ChannelA=0 @@ -89,8 +91,8 @@ Threshold=25 [Directional Pyramid Denoising] Enabled=false -Luma=10 -Chroma=10 +Luma=5 +Chroma=5 Gamma=2 LumCurve=0; ChromCurve=0; @@ -118,8 +120,8 @@ Radius=30 Enabled=false X=0 Y=0 -W=4276 -H=2836 +W=4281 +H=2871 FixedRatio=false Ratio=3:2 Orientation=Landscape @@ -131,7 +133,7 @@ HorizontalFlip=false VerticalFlip=false [Common Properties for Transformations] -AutoFill=true +AutoFill=false [Rotation] Degree=0 @@ -156,8 +158,8 @@ CenterX=0 CenterY=0 [HLRecovery] -Enabled=true -Method=Luminance +Enabled=false +Method=Blend [Resize] Enabled=false @@ -165,12 +167,12 @@ Scale=1 AppliesTo=Cropped area Method=Bicubic DataSpecified=0 -Width=4276 -Height=2836 +Width=4281 +Height=2871 [Color Management] InputProfile=(camera) -ApplyGammaBeforeInputProfile=false +BlendCMSMatrix=false WorkingProfile=ProPhoto OutputProfile=No ICM: sRGB output Gammafree=default @@ -178,17 +180,6 @@ Freegamma=false GammaValue=2.22 GammaSlope=4.5 -[Equalizer] -Enabled=false -C0=0 -C1=0 -C2=0 -C3=0 -C4=0 -C5=0 -C6=0 -C7=0 - [Directional Pyramid Equalizer] Enabled=true Mult0=3 @@ -209,7 +200,7 @@ FlatFieldFile= FlatFieldAutoSelect=false FlatFieldBlurRadius=32 FlatFieldBlurType=Area Flatfield -CA=true +CA=false CARed=0 CABlue=0 HotDeadPixels=false diff --git a/rtdata/profiles/Natural-2.pp3 b/rtdata/profiles/Natural-2.pp3 index e2ae204a7..163058abc 100644 --- a/rtdata/profiles/Natural-2.pp3 +++ b/rtdata/profiles/Natural-2.pp3 @@ -1,7 +1,7 @@ [Version] -AppVersion=Dev-3.1m6.89 -Version=300 +AppVersion=4.0.5.7 +Version=301 [General] Rank=0 @@ -10,16 +10,16 @@ InTrash=false [Exposure] Auto=true -Clip=0.0005 +Clip=0 Compensation=0 Brightness=0 -Contrast=0 -Saturation=0 +Contrast=20 +Saturation=5 Black=0 -HighlightCompr=70 -HighlightComprThreshold=30 +HighlightCompr=0 +HighlightComprThreshold=33 ShadowCompr=50 -Curve=1;0;0;0.44254265471370757;0.57406737998843294;1;1; +Curve=1;0;0;0.45754265471370759;0.57906737998843294;1;1; [Channel Mixer] Red=100;0;0; @@ -27,13 +27,13 @@ Green=0;100;0; Blue=0;0;100; [Luminance Curve] -Brightness=-20 -Contrast=-20 -Saturation=10 +Brightness=0 +Contrast=0 +Saturation=5 AvoidColorClipping=false SaturationLimiter=false SaturationLimit=40 -LCurve=3;0;0;0.04270462633451956;0.01423487544483986;0.23843416370106757;0.17437722419928825;0.48042704626334531;0.44128113879003594;0.62989323843416389;0.69039145907473343;0.72953736654804269;0.83274021352313166;0.86120996441281117;0.95729537366548023;1;1; +LCurve=3;0;0;0.84892086330935235;0.69064748201438808;1;1; aCurve=0; bCurve=0; @@ -53,15 +53,17 @@ DeconvAmount=75 DeconvDamping=20 DeconvIterations=30 -[Clarity] +[SharpenEdge] +Enabled=false +Passes=2 +Strength=50 +ThreeChannels=false + +[SharpenMicro] Enabled=false -Clpasses=2 -Clstrength=50 -Clthreechannels=false -Enabledtwo=false -Mlstrength=20 -Uniformity=50 Matrix=false +Strength=20 +Uniformity=50 [Color Boost] Amount=0 @@ -89,8 +91,8 @@ Threshold=25 [Directional Pyramid Denoising] Enabled=false -Luma=10 -Chroma=10 +Luma=5 +Chroma=5 Gamma=2 LumCurve=0; ChromCurve=0; @@ -118,8 +120,8 @@ Radius=30 Enabled=false X=0 Y=0 -W=2836 -H=4276 +W=4281 +H=2871 FixedRatio=false Ratio=3:2 Orientation=Landscape @@ -131,7 +133,7 @@ HorizontalFlip=false VerticalFlip=false [Common Properties for Transformations] -AutoFill=true +AutoFill=false [Rotation] Degree=0 @@ -156,8 +158,8 @@ CenterX=0 CenterY=0 [HLRecovery] -Enabled=true -Method=Luminance +Enabled=false +Method=Blend [Resize] Enabled=false @@ -165,12 +167,12 @@ Scale=1 AppliesTo=Cropped area Method=Bicubic DataSpecified=0 -Width=2836 -Height=4276 +Width=4281 +Height=2871 [Color Management] InputProfile=(camera) -ApplyGammaBeforeInputProfile=false +BlendCMSMatrix=false WorkingProfile=ProPhoto OutputProfile=No ICM: sRGB output Gammafree=default @@ -178,17 +180,6 @@ Freegamma=false GammaValue=2.22 GammaSlope=4.5 -[Equalizer] -Enabled=false -C0=0 -C1=0 -C2=0 -C3=0 -C4=0 -C5=0 -C6=0 -C7=0 - [Directional Pyramid Equalizer] Enabled=true Mult0=3 @@ -209,7 +200,7 @@ FlatFieldFile= FlatFieldAutoSelect=false FlatFieldBlurRadius=32 FlatFieldBlurType=Area Flatfield -CA=true +CA=false CARed=0 CABlue=0 HotDeadPixels=false diff --git a/rtdata/profiles/Punchy-0.pp3 b/rtdata/profiles/Punchy-0.pp3 deleted file mode 100644 index 44ef938f5..000000000 --- a/rtdata/profiles/Punchy-0.pp3 +++ /dev/null @@ -1,230 +0,0 @@ - -[Version] -AppVersion=Dev-3.1m6.89 -Version=300 - -[General] -Rank=0 -ColorLabel=0 -InTrash=false - -[Exposure] -Auto=true -Clip=0 -Compensation=0 -Brightness=8 -Contrast=10 -Saturation=15 -Black=0 -HighlightCompr=70 -HighlightComprThreshold=30 -ShadowCompr=50 -Curve=1;0;0;0.46963562753036442;0.53036437246963564;1;1; - -[Channel Mixer] -Red=120;-10;-10; -Green=-10;120;-10; -Blue=-10;-10;120; - -[Luminance Curve] -Brightness=-5 -Contrast=10 -Saturation=20 -AvoidColorClipping=false -SaturationLimiter=false -SaturationLimit=40 -LCurve=2;0.25;0.5;0.75;50;12;-12;-50; -aCurve=0; -bCurve=0; - -[Sharpening] -Enabled=false -Method=usm -Radius=0.5 -Amount=250 -Threshold=512 -OnlyEdges=false -EdgedetectionRadius=1.9 -EdgeTolerance=1800 -HalocontrolEnabled=false -HalocontrolAmount=85 -DeconvRadius=0.75 -DeconvAmount=75 -DeconvDamping=20 -DeconvIterations=30 - -[Clarity] -Enabled=false -Clpasses=2 -Clstrength=50 -Clthreechannels=false -Enabledtwo=false -Mlstrength=20 -Uniformity=50 -Matrix=false - -[Color Boost] -Amount=0 -AvoidColorClipping=false -SaturationLimiter=false -SaturationLimit=75 - -[White Balance] -Setting=Camera -Temperature=5435 -Green=1.0619999999999992 - -[Color Shift] -ChannelA=0 -ChannelB=0 - -[Impulse Denoising] -Enabled=false -Threshold=50 - -[Defringing] -Enabled=false -Radius=2 -Threshold=25 - -[Directional Pyramid Denoising] -Enabled=false -Luma=10 -Chroma=10 -Gamma=2 -LumCurve=0; -ChromCurve=0; - -[Luminance Denoising] -Enabled=false -Radius=2.5 -EdgeTolerance=1500 - -[Chrominance Denoising] -Enabled=false -Amount=20 - -[Shadows & Highlights] -Enabled=false -HighQuality=false -Highlights=10 -HighlightTonalWidth=80 -Shadows=10 -ShadowTonalWidth=80 -LocalContrast=0 -Radius=30 - -[Crop] -Enabled=false -X=0 -Y=0 -W=4276 -H=2836 -FixedRatio=false -Ratio=3:2 -Orientation=Landscape -Guide=None - -[Coarse Transformation] -Rotate=0 -HorizontalFlip=false -VerticalFlip=false - -[Common Properties for Transformations] -AutoFill=true - -[Rotation] -Degree=0 - -[Distortion] -Amount=0 -UseLensFun=false - -[Perspective] -Horizontal=0 -Vertical=0 - -[CACorrection] -Red=0 -Blue=0 - -[Vignetting Correction] -Amount=0 -Radius=50 -Strength=1 -CenterX=0 -CenterY=0 - -[HLRecovery] -Enabled=true -Method=Luminance - -[Resize] -Enabled=false -Scale=1 -AppliesTo=Cropped area -Method=Bicubic -DataSpecified=0 -Width=4276 -Height=2836 - -[Color Management] -InputProfile=(camera) -ApplyGammaBeforeInputProfile=false -WorkingProfile=ProPhoto -OutputProfile=No ICM: sRGB output -Gammafree=default -Freegamma=false -GammaValue=2.22 -GammaSlope=4.5 - -[Equalizer] -Enabled=false -C0=0 -C1=0 -C2=0 -C3=0 -C4=0 -C5=0 -C6=0 -C7=0 - -[Directional Pyramid Equalizer] -Enabled=true -Mult0=3.6 -Mult1=1.8 -Mult2=1.3 -Mult3=1.0 -Mult4=0.2 - -[HSV Equalizer] -HCurve=0; -SCurve=0; -VCurve=0; - -[RAW] -DarkFrame= -DarkFrameAuto=false -FlatFieldFile= -FlatFieldAutoSelect=false -FlatFieldBlurRadius=32 -FlatFieldBlurType=Area Flatfield -CA=true -CARed=0 -CABlue=0 -HotDeadPixels=false -HotDeadPixelThresh=40 -LineDenoise=0 -GreenEqThreshold=0 -CcSteps=1 -Method=amaze -DCBIterations=2 -DCBEnhance=false -ALLEnhance=false -PreExposure=1 -PrePreserv=0 -PreBlackzero=0 -PreBlackone=0 -PreBlacktwo=0 -PreBlackthree=0 -PreTwoGreen=true diff --git a/rtdata/profiles/Punchy-1.pp3 b/rtdata/profiles/Punchy-1.pp3 index ac5b39d82..9932521e9 100644 --- a/rtdata/profiles/Punchy-1.pp3 +++ b/rtdata/profiles/Punchy-1.pp3 @@ -1,7 +1,7 @@ [Version] -AppVersion=Dev-3.1m6.89 -Version=300 +AppVersion=4.0.5.7 +Version=301 [General] Rank=0 @@ -10,16 +10,16 @@ InTrash=false [Exposure] Auto=true -Clip=0.0005 -Compensation=0 -Brightness=8 -Contrast=10 -Saturation=15 +Clip=0 +Compensation=-0 +Brightness=0 +Contrast=0 +Saturation=0 Black=0 -HighlightCompr=70 -HighlightComprThreshold=30 +HighlightCompr=0 +HighlightComprThreshold=33 ShadowCompr=50 -Curve=1;0;0;0.46963562753036442;0.53036437246963564;1;1; +Curve=0; [Channel Mixer] Red=120;-10;-10; @@ -27,13 +27,13 @@ Green=-10;120;-10; Blue=-10;-10;120; [Luminance Curve] -Brightness=-5 +Brightness=0 Contrast=10 -Saturation=20 +Saturation=5 AvoidColorClipping=false SaturationLimiter=false SaturationLimit=40 -LCurve=2;0.25;0.5;0.75;50;12;-12;-50; +LCurve=0; aCurve=0; bCurve=0; @@ -53,15 +53,26 @@ DeconvAmount=75 DeconvDamping=20 DeconvIterations=30 -[Clarity] +[Vibrance] +Enabled=false +Pastels=0 +Saturated=0 +PSThreshold=75 +ProtectSkins=false +AvoidColorShift=true +PastSatTog=true + +[SharpenEdge] +Enabled=false +Passes=2 +Strength=50 +ThreeChannels=false + +[SharpenMicro] Enabled=false -Clpasses=2 -Clstrength=50 -Clthreechannels=false -Enabledtwo=false -Mlstrength=20 -Uniformity=50 Matrix=false +Strength=20 +Uniformity=50 [Color Boost] Amount=0 @@ -71,8 +82,8 @@ SaturationLimit=75 [White Balance] Setting=Camera -Temperature=5435 -Green=1.0619999999999992 +Temperature=5745 +Green=1.0353332844067824 [Color Shift] ChannelA=0 @@ -84,13 +95,13 @@ Threshold=50 [Defringing] Enabled=false -Radius=2 +Radius=2.0 Threshold=25 [Directional Pyramid Denoising] Enabled=false -Luma=10 -Chroma=10 +Luma=5 +Chroma=5 Gamma=2 LumCurve=0; ChromCurve=0; @@ -131,7 +142,7 @@ HorizontalFlip=false VerticalFlip=false [Common Properties for Transformations] -AutoFill=true +AutoFill=false [Rotation] Degree=0 @@ -156,21 +167,21 @@ CenterX=0 CenterY=0 [HLRecovery] -Enabled=true -Method=Luminance +Enabled=false +Method=Blend [Resize] Enabled=false -Scale=1 +Scale=1.0 AppliesTo=Cropped area Method=Bicubic DataSpecified=0 -Width=4276 -Height=2836 +Width=4281 +Height=2871 [Color Management] InputProfile=(camera) -ApplyGammaBeforeInputProfile=false +BlendCMSMatrix=false WorkingProfile=ProPhoto OutputProfile=No ICM: sRGB output Gammafree=default @@ -178,23 +189,12 @@ Freegamma=false GammaValue=2.22 GammaSlope=4.5 -[Equalizer] -Enabled=false -C0=0 -C1=0 -C2=0 -C3=0 -C4=0 -C5=0 -C6=0 -C7=0 - [Directional Pyramid Equalizer] Enabled=true -Mult0=3.6 +Mult0=3.0 Mult1=1.8 Mult2=1.3 -Mult3=1.0099999999999996 +Mult3=1.0 Mult4=0.2 [HSV Equalizer] @@ -209,7 +209,7 @@ FlatFieldFile= FlatFieldAutoSelect=false FlatFieldBlurRadius=32 FlatFieldBlurType=Area Flatfield -CA=true +CA=false CARed=0 CABlue=0 HotDeadPixels=false diff --git a/rtdata/profiles/Punchy-2.pp3 b/rtdata/profiles/Punchy-2.pp3 index 2e0db01f3..e49233dbf 100644 --- a/rtdata/profiles/Punchy-2.pp3 +++ b/rtdata/profiles/Punchy-2.pp3 @@ -1,7 +1,7 @@ [Version] -AppVersion=Dev-3.1m6.89 -Version=300 +AppVersion=4.0.5.7 +Version=301 [General] Rank=0 @@ -11,29 +11,29 @@ InTrash=false [Exposure] Auto=true Clip=0 -Compensation=0 -Brightness=8 -Contrast=10 -Saturation=15 +Compensation=0.0 +Brightness=0 +Contrast=0 +Saturation=0 Black=0 -HighlightCompr=70 -HighlightComprThreshold=30 +HighlightCompr=0 +HighlightComprThreshold=33 ShadowCompr=50 -Curve=1;0;0;0.46963562753036442;0.53036437246963564;1;1; +Curve=0; [Channel Mixer] -Red=120;-10;-10; -Green=-10;120;-10; -Blue=-10;-10;120; +Red=100;0;0; +Green=0;100;0; +Blue=0;0;100; [Luminance Curve] -Brightness=-5 -Contrast=0 -Saturation=20 +Brightness=0 +Contrast=10 +Saturation=0 AvoidColorClipping=false SaturationLimiter=false SaturationLimit=40 -LCurve=3;0;0;0.18623481781376497;0.028340080971659902;0.50607287449392713;0.50607287449392713;0.77732793522267185;0.97975708502024295;1;1; +LCurve=0; aCurve=0; bCurve=0; @@ -53,15 +53,26 @@ DeconvAmount=75 DeconvDamping=20 DeconvIterations=30 -[Clarity] +[Vibrance] +Enabled=true +Pastels=50 +Saturated=50 +PSThreshold=75 +ProtectSkins=false +AvoidColorShift=true +PastSatTog=true + +[SharpenEdge] +Enabled=false +Passes=2 +Strength=50 +ThreeChannels=false + +[SharpenMicro] Enabled=false -Clpasses=2 -Clstrength=50 -Clthreechannels=false -Enabledtwo=false -Mlstrength=20 -Uniformity=50 Matrix=false +Strength=20 +Uniformity=50 [Color Boost] Amount=0 @@ -71,8 +82,8 @@ SaturationLimit=75 [White Balance] Setting=Camera -Temperature=5435 -Green=1.0619999999999992 +Temperature=5745 +Green=1.0349999999999993 [Color Shift] ChannelA=0 @@ -84,13 +95,13 @@ Threshold=50 [Defringing] Enabled=false -Radius=2 +Radius=2.0 Threshold=25 [Directional Pyramid Denoising] Enabled=false -Luma=10 -Chroma=10 +Luma=5 +Chroma=5 Gamma=2 LumCurve=0; ChromCurve=0; @@ -131,7 +142,7 @@ HorizontalFlip=false VerticalFlip=false [Common Properties for Transformations] -AutoFill=true +AutoFill=false [Rotation] Degree=0 @@ -156,12 +167,12 @@ CenterX=0 CenterY=0 [HLRecovery] -Enabled=true -Method=Luminance +Enabled=false +Method=Blend [Resize] Enabled=false -Scale=1 +Scale=1.0 AppliesTo=Cropped area Method=Bicubic DataSpecified=0 @@ -170,7 +181,7 @@ Height=2836 [Color Management] InputProfile=(camera) -ApplyGammaBeforeInputProfile=false +BlendCMSMatrix=false WorkingProfile=ProPhoto OutputProfile=No ICM: sRGB output Gammafree=default @@ -178,23 +189,12 @@ Freegamma=false GammaValue=2.22 GammaSlope=4.5 -[Equalizer] -Enabled=false -C0=0 -C1=0 -C2=0 -C3=0 -C4=0 -C5=0 -C6=0 -C7=0 - [Directional Pyramid Equalizer] Enabled=true -Mult0=3.6 +Mult0=3.0 Mult1=1.8 Mult2=1.3 -Mult3=1.0099999999999996 +Mult3=1.0 Mult4=0.2 [HSV Equalizer] @@ -209,7 +209,7 @@ FlatFieldFile= FlatFieldAutoSelect=false FlatFieldBlurRadius=32 FlatFieldBlurType=Area Flatfield -CA=true +CA=false CARed=0 CABlue=0 HotDeadPixels=false diff --git a/rtdata/profiles/Tuned-1.pp3 b/rtdata/profiles/Tuned-1.pp3 index 75773ad9c..cf1f10531 100644 --- a/rtdata/profiles/Tuned-1.pp3 +++ b/rtdata/profiles/Tuned-1.pp3 @@ -1,7 +1,7 @@ [Version] -AppVersion=Dev-3.1m6.89 -Version=300 +AppVersion=4.0.5.7 +Version=301 [General] Rank=0 @@ -10,16 +10,16 @@ InTrash=false [Exposure] Auto=true -Clip=0.0005 +Clip=0 Compensation=0 -Brightness=8 +Brightness=0 Contrast=0 -Saturation=22 +Saturation=-10 Black=0 -HighlightCompr=70 -HighlightComprThreshold=30 +HighlightCompr=0 +HighlightComprThreshold=33 ShadowCompr=50 -Curve=0; +Curve=2;0.10500000000000001;0.25;0.75;15;60;30;-70; [Channel Mixer] Red=100;0;0; @@ -29,11 +29,11 @@ Blue=0;0;100; [Luminance Curve] Brightness=0 Contrast=5 -Saturation=18 +Saturation=-10 AvoidColorClipping=false SaturationLimiter=false SaturationLimit=40 -LCurve=2;0.25;0.5;0.75;50;12;-12;-50; +LCurve=0; aCurve=0; bCurve=0; @@ -53,15 +53,17 @@ DeconvAmount=75 DeconvDamping=20 DeconvIterations=30 -[Clarity] +[SharpenEdge] +Enabled=false +Passes=2 +Strength=50 +ThreeChannels=false + +[SharpenMicro] Enabled=false -Clpasses=2 -Clstrength=50 -Clthreechannels=false -Enabledtwo=false -Mlstrength=20 -Uniformity=50 Matrix=false +Strength=20 +Uniformity=50 [Color Boost] Amount=0 @@ -71,8 +73,8 @@ SaturationLimit=75 [White Balance] Setting=Camera -Temperature=5435 -Green=1.0619999999999992 +Temperature=5000 +Green=1 [Color Shift] ChannelA=0 @@ -89,8 +91,8 @@ Threshold=25 [Directional Pyramid Denoising] Enabled=false -Luma=10 -Chroma=10 +Luma=5 +Chroma=5 Gamma=2 LumCurve=0; ChromCurve=0; @@ -118,8 +120,8 @@ Radius=30 Enabled=false X=0 Y=0 -W=4276 -H=2836 +W=4281 +H=2871 FixedRatio=false Ratio=3:2 Orientation=Landscape @@ -131,7 +133,7 @@ HorizontalFlip=false VerticalFlip=false [Common Properties for Transformations] -AutoFill=true +AutoFill=false [Rotation] Degree=0 @@ -156,8 +158,8 @@ CenterX=0 CenterY=0 [HLRecovery] -Enabled=true -Method=Luminance +Enabled=false +Method=Blend [Resize] Enabled=false @@ -165,12 +167,12 @@ Scale=1 AppliesTo=Cropped area Method=Bicubic DataSpecified=0 -Width=4276 -Height=2836 +Width=4281 +Height=2871 [Color Management] InputProfile=(camera) -ApplyGammaBeforeInputProfile=false +BlendCMSMatrix=false WorkingProfile=ProPhoto OutputProfile=No ICM: sRGB output Gammafree=default @@ -178,17 +180,6 @@ Freegamma=false GammaValue=2.22 GammaSlope=4.5 -[Equalizer] -Enabled=false -C0=0 -C1=0 -C2=0 -C3=0 -C4=0 -C5=0 -C6=0 -C7=0 - [Directional Pyramid Equalizer] Enabled=true Mult0=3 @@ -209,7 +200,7 @@ FlatFieldFile= FlatFieldAutoSelect=false FlatFieldBlurRadius=32 FlatFieldBlurType=Area Flatfield -CA=true +CA=false CARed=0 CABlue=0 HotDeadPixels=false diff --git a/rtdata/profiles/Tuned-2.pp3 b/rtdata/profiles/Tuned-2.pp3 deleted file mode 100644 index 6d59cfb51..000000000 --- a/rtdata/profiles/Tuned-2.pp3 +++ /dev/null @@ -1,230 +0,0 @@ - -[Version] -AppVersion=Dev-3.1m6.89 -Version=300 - -[General] -Rank=0 -ColorLabel=0 -InTrash=false - -[Exposure] -Auto=true -Clip=0.0005 -Compensation=0 -Brightness=8 -Contrast=0 -Saturation=22 -Black=0 -HighlightCompr=70 -HighlightComprThreshold=30 -ShadowCompr=50 -Curve=0; - -[Channel Mixer] -Red=100;0;0; -Green=0;100;0; -Blue=0;0;100; - -[Luminance Curve] -Brightness=0 -Contrast=5 -Saturation=20 -AvoidColorClipping=false -SaturationLimiter=false -SaturationLimit=40 -LCurve=3;0;0;0.18623481781376497;0.028340080971659902;0.50607287449392713;0.50607287449392713;0.77732793522267185;0.97975708502024295;1;1; -aCurve=0; -bCurve=0; - -[Sharpening] -Enabled=false -Method=usm -Radius=0.5 -Amount=250 -Threshold=512 -OnlyEdges=false -EdgedetectionRadius=1.9 -EdgeTolerance=1800 -HalocontrolEnabled=false -HalocontrolAmount=85 -DeconvRadius=0.75 -DeconvAmount=75 -DeconvDamping=20 -DeconvIterations=30 - -[Clarity] -Enabled=false -Clpasses=2 -Clstrength=50 -Clthreechannels=false -Enabledtwo=false -Mlstrength=20 -Uniformity=50 -Matrix=false - -[Color Boost] -Amount=0 -AvoidColorClipping=false -SaturationLimiter=false -SaturationLimit=75 - -[White Balance] -Setting=Camera -Temperature=5000 -Green=1.0 - -[Color Shift] -ChannelA=0 -ChannelB=0 - -[Impulse Denoising] -Enabled=false -Threshold=50 - -[Defringing] -Enabled=false -Radius=2 -Threshold=25 - -[Directional Pyramid Denoising] -Enabled=false -Luma=10 -Chroma=10 -Gamma=2 -LumCurve=0; -ChromCurve=0; - -[Luminance Denoising] -Enabled=false -Radius=2.5 -EdgeTolerance=1500 - -[Chrominance Denoising] -Enabled=false -Amount=20 - -[Shadows & Highlights] -Enabled=false -HighQuality=false -Highlights=10 -HighlightTonalWidth=80 -Shadows=10 -ShadowTonalWidth=80 -LocalContrast=0 -Radius=30 - -[Crop] -Enabled=false -X=0 -Y=0 -W=4276 -H=2836 -FixedRatio=false -Ratio=3:2 -Orientation=Landscape -Guide=None - -[Coarse Transformation] -Rotate=0 -HorizontalFlip=false -VerticalFlip=false - -[Common Properties for Transformations] -AutoFill=true - -[Rotation] -Degree=0 - -[Distortion] -Amount=0 -UseLensFun=false - -[Perspective] -Horizontal=0 -Vertical=0 - -[CACorrection] -Red=0 -Blue=0 - -[Vignetting Correction] -Amount=0 -Radius=50 -Strength=1 -CenterX=0 -CenterY=0 - -[HLRecovery] -Enabled=true -Method=Luminance - -[Resize] -Enabled=false -Scale=1 -AppliesTo=Cropped area -Method=Bicubic -DataSpecified=0 -Width=4276 -Height=2836 - -[Color Management] -InputProfile=(camera) -ApplyGammaBeforeInputProfile=false -WorkingProfile=ProPhoto -OutputProfile=No ICM: sRGB output -Gammafree=default -Freegamma=false -GammaValue=2.22 -GammaSlope=4.5 - -[Equalizer] -Enabled=false -C0=0 -C1=0 -C2=0 -C3=0 -C4=0 -C5=0 -C6=0 -C7=0 - -[Directional Pyramid Equalizer] -Enabled=true -Mult0=3 -Mult1=1 -Mult2=1 -Mult3=1 -Mult4=0.2 - -[HSV Equalizer] -HCurve=0; -SCurve=0; -VCurve=0; - -[RAW] -DarkFrame= -DarkFrameAuto=false -FlatFieldFile= -FlatFieldAutoSelect=false -FlatFieldBlurRadius=32 -FlatFieldBlurType=Area Flatfield -CA=true -CARed=0 -CABlue=0 -HotDeadPixels=false -HotDeadPixelThresh=40 -LineDenoise=0 -GreenEqThreshold=0 -CcSteps=1 -Method=amaze -DCBIterations=2 -DCBEnhance=false -ALLEnhance=false -PreExposure=1 -PrePreserv=0 -PreBlackzero=0 -PreBlackone=0 -PreBlacktwo=0 -PreBlackthree=0 -PreTwoGreen=true diff --git a/rtdata/profiles/Tuned-3.pp3 b/rtdata/profiles/Tuned-3.pp3 deleted file mode 100644 index 8cc593956..000000000 --- a/rtdata/profiles/Tuned-3.pp3 +++ /dev/null @@ -1,230 +0,0 @@ - -[Version] -AppVersion=Dev-3.1m6.89 -Version=300 - -[General] -Rank=0 -ColorLabel=0 -InTrash=false - -[Exposure] -Auto=true -Clip=0.0005 -Compensation=0 -Brightness=25 -Contrast=20 -Saturation=0 -Black=0 -HighlightCompr=70 -HighlightComprThreshold=30 -ShadowCompr=50 -Curve=0; - -[Channel Mixer] -Red=100;0;0; -Green=0;100;0; -Blue=0;0;100; - -[Luminance Curve] -Brightness=-15 -Contrast=25 -Saturation=25 -AvoidColorClipping=false -SaturationLimiter=false -SaturationLimit=40 -LCurve=0; -aCurve=0; -bCurve=0; - -[Sharpening] -Enabled=false -Method=usm -Radius=0.5 -Amount=250 -Threshold=512 -OnlyEdges=false -EdgedetectionRadius=1.9 -EdgeTolerance=1800 -HalocontrolEnabled=false -HalocontrolAmount=85 -DeconvRadius=0.75 -DeconvAmount=75 -DeconvDamping=20 -DeconvIterations=30 - -[Clarity] -Enabled=false -Clpasses=2 -Clstrength=50 -Clthreechannels=false -Enabledtwo=false -Mlstrength=20 -Uniformity=50 -Matrix=false - -[Color Boost] -Amount=0 -AvoidColorClipping=false -SaturationLimiter=false -SaturationLimit=75 - -[White Balance] -Setting=Camera -Temperature=5000 -Green=1.0 - -[Color Shift] -ChannelA=0 -ChannelB=0 - -[Impulse Denoising] -Enabled=false -Threshold=50 - -[Defringing] -Enabled=false -Radius=2 -Threshold=25 - -[Directional Pyramid Denoising] -Enabled=false -Luma=10 -Chroma=10 -Gamma=2 -LumCurve=0; -ChromCurve=0; - -[Luminance Denoising] -Enabled=false -Radius=2.5 -EdgeTolerance=1500 - -[Chrominance Denoising] -Enabled=false -Amount=20 - -[Shadows & Highlights] -Enabled=false -HighQuality=false -Highlights=10 -HighlightTonalWidth=80 -Shadows=10 -ShadowTonalWidth=80 -LocalContrast=0 -Radius=30 - -[Crop] -Enabled=false -X=0 -Y=0 -W=4276 -H=2836 -FixedRatio=false -Ratio=3:2 -Orientation=Landscape -Guide=None - -[Coarse Transformation] -Rotate=0 -HorizontalFlip=false -VerticalFlip=false - -[Common Properties for Transformations] -AutoFill=true - -[Rotation] -Degree=0 - -[Distortion] -Amount=0 -UseLensFun=false - -[Perspective] -Horizontal=0 -Vertical=0 - -[CACorrection] -Red=0 -Blue=0 - -[Vignetting Correction] -Amount=0 -Radius=50 -Strength=1 -CenterX=0 -CenterY=0 - -[HLRecovery] -Enabled=true -Method=Luminance - -[Resize] -Enabled=false -Scale=1 -AppliesTo=Cropped area -Method=Bicubic -DataSpecified=0 -Width=4276 -Height=2836 - -[Color Management] -InputProfile=(camera) -ApplyGammaBeforeInputProfile=false -WorkingProfile=ProPhoto -OutputProfile=No ICM: sRGB output -Gammafree=default -Freegamma=false -GammaValue=2.22 -GammaSlope=4.5 - -[Equalizer] -Enabled=false -C0=0 -C1=0 -C2=0 -C3=0 -C4=0 -C5=0 -C6=0 -C7=0 - -[Directional Pyramid Equalizer] -Enabled=true -Mult0=3 -Mult1=1 -Mult2=1 -Mult3=1 -Mult4=0.2 - -[HSV Equalizer] -HCurve=0; -SCurve=0; -VCurve=0; - -[RAW] -DarkFrame= -DarkFrameAuto=false -FlatFieldFile= -FlatFieldAutoSelect=false -FlatFieldBlurRadius=32 -FlatFieldBlurType=Area Flatfield -CA=true -CARed=0 -CABlue=0 -HotDeadPixels=false -HotDeadPixelThresh=40 -LineDenoise=0 -GreenEqThreshold=0 -CcSteps=1 -Method=amaze -DCBIterations=2 -DCBEnhance=false -ALLEnhance=false -PreExposure=1 -PrePreserv=0 -PreBlackzero=0 -PreBlackone=0 -PreBlacktwo=0 -PreBlackthree=0 -PreTwoGreen=true diff --git a/rtdata/profiles/default-ISO-high.pp3 b/rtdata/profiles/default-ISO-high.pp3 index e80979cd2..e7f78cf92 100644 --- a/rtdata/profiles/default-ISO-high.pp3 +++ b/rtdata/profiles/default-ISO-high.pp3 @@ -1,7 +1,7 @@ [Version] -AppVersion=Dev-3.1m6.89 -Version=300 +AppVersion=4.0.5.7 +Version=301 [General] Rank=0 @@ -9,15 +9,15 @@ ColorLabel=0 InTrash=false [Exposure] -Auto=false -Clip=0.0002 +Auto=true +Clip=0 Compensation=0 -Brightness=10 +Brightness=0 Contrast=20 -Saturation=0 +Saturation=5 Black=0 -HighlightCompr=70 -HighlightComprThreshold=30 +HighlightCompr=0 +HighlightComprThreshold=33 ShadowCompr=50 Curve=0; @@ -27,9 +27,9 @@ Green=0;100;0; Blue=0;0;100; [Luminance Curve] -Brightness=-5 +Brightness=0 Contrast=0 -Saturation=20 +Saturation=5 AvoidColorClipping=false SaturationLimiter=false SaturationLimit=40 @@ -53,15 +53,17 @@ DeconvAmount=75 DeconvDamping=20 DeconvIterations=30 -[Clarity] +[SharpenEdge] +Enabled=false +Passes=2 +Strength=50 +ThreeChannels=false + +[SharpenMicro] Enabled=false -Clpasses=2 -Clstrength=50 -Clthreechannels=false -Enabledtwo=false -Mlstrength=20 -Uniformity=50 Matrix=false +Strength=20 +Uniformity=50 [Color Boost] Amount=0 @@ -90,8 +92,8 @@ Threshold=25 [Directional Pyramid Denoising] Enabled=true Luma=0 -Chroma=30 -Gamma=1.1 +Chroma=10 +Gamma=1.2 LumCurve=0; ChromCurve=0; @@ -131,7 +133,7 @@ HorizontalFlip=false VerticalFlip=false [Common Properties for Transformations] -AutoFill=true +AutoFill=false [Rotation] Degree=0 @@ -156,8 +158,8 @@ CenterX=0 CenterY=0 [HLRecovery] -Enabled=true -Method=Luminance +Enabled=false +Method=Blend [Resize] Enabled=false @@ -170,7 +172,7 @@ Height=2871 [Color Management] InputProfile=(camera) -ApplyGammaBeforeInputProfile=false +BlendCMSMatrix=false WorkingProfile=ProPhoto OutputProfile=No ICM: sRGB output Gammafree=default @@ -178,17 +180,6 @@ Freegamma=false GammaValue=2.22 GammaSlope=4.5 -[Equalizer] -Enabled=false -C0=0 -C1=0 -C2=0 -C3=0 -C4=0 -C5=0 -C6=0 -C7=0 - [Directional Pyramid Equalizer] Enabled=true Mult0=1 @@ -209,7 +200,7 @@ FlatFieldFile= FlatFieldAutoSelect=false FlatFieldBlurRadius=32 FlatFieldBlurType=Area Flatfield -CA=true +CA=false CARed=0 CABlue=0 HotDeadPixels=false @@ -221,7 +212,7 @@ Method=amaze DCBIterations=2 DCBEnhance=false ALLEnhance=false -PreExposure=0.99999999999999956 +PreExposure=1 PrePreserv=0 PreBlackzero=0 PreBlackone=0 diff --git a/rtdata/profiles/default-ISO-medium.pp3 b/rtdata/profiles/default-ISO-medium.pp3 index 5de2acd9e..9b042da1f 100644 --- a/rtdata/profiles/default-ISO-medium.pp3 +++ b/rtdata/profiles/default-ISO-medium.pp3 @@ -1,7 +1,7 @@ [Version] -AppVersion=Dev-3.1m6.89 -Version=300 +AppVersion=4.0.5.7 +Version=301 [General] Rank=0 @@ -9,15 +9,15 @@ ColorLabel=0 InTrash=false [Exposure] -Auto=false -Clip=0.0002 +Auto=true +Clip=0 Compensation=0 -Brightness=10 +Brightness=0 Contrast=20 -Saturation=0 +Saturation=5 Black=0 -HighlightCompr=70 -HighlightComprThreshold=30 +HighlightCompr=0 +HighlightComprThreshold=33 ShadowCompr=50 Curve=0; @@ -27,9 +27,9 @@ Green=0;100;0; Blue=0;0;100; [Luminance Curve] -Brightness=-5 +Brightness=0 Contrast=0 -Saturation=20 +Saturation=5 AvoidColorClipping=false SaturationLimiter=false SaturationLimit=40 @@ -53,15 +53,17 @@ DeconvAmount=75 DeconvDamping=20 DeconvIterations=30 -[Clarity] +[SharpenEdge] +Enabled=false +Passes=2 +Strength=50 +ThreeChannels=false + +[SharpenMicro] Enabled=false -Clpasses=2 -Clstrength=50 -Clthreechannels=false -Enabledtwo=false -Mlstrength=20 -Uniformity=50 Matrix=false +Strength=20 +Uniformity=50 [Color Boost] Amount=0 @@ -90,8 +92,8 @@ Threshold=25 [Directional Pyramid Denoising] Enabled=true Luma=0 -Chroma=15 -Gamma=1.1 +Chroma=5 +Gamma=1.2 LumCurve=0; ChromCurve=0; @@ -131,7 +133,7 @@ HorizontalFlip=false VerticalFlip=false [Common Properties for Transformations] -AutoFill=true +AutoFill=false [Rotation] Degree=0 @@ -156,8 +158,8 @@ CenterX=0 CenterY=0 [HLRecovery] -Enabled=true -Method=Luminance +Enabled=false +Method=Blend [Resize] Enabled=false @@ -170,7 +172,7 @@ Height=2871 [Color Management] InputProfile=(camera) -ApplyGammaBeforeInputProfile=false +BlendCMSMatrix=false WorkingProfile=ProPhoto OutputProfile=No ICM: sRGB output Gammafree=default @@ -178,17 +180,6 @@ Freegamma=false GammaValue=2.22 GammaSlope=4.5 -[Equalizer] -Enabled=false -C0=0 -C1=0 -C2=0 -C3=0 -C4=0 -C5=0 -C6=0 -C7=0 - [Directional Pyramid Equalizer] Enabled=true Mult0=1 @@ -209,7 +200,7 @@ FlatFieldFile= FlatFieldAutoSelect=false FlatFieldBlurRadius=32 FlatFieldBlurType=Area Flatfield -CA=true +CA=false CARed=0 CABlue=0 HotDeadPixels=false @@ -221,7 +212,7 @@ Method=amaze DCBIterations=2 DCBEnhance=false ALLEnhance=false -PreExposure=0.99999999999999956 +PreExposure=1 PrePreserv=0 PreBlackzero=0 PreBlackone=0 diff --git a/rtdata/profiles/default.pp3 b/rtdata/profiles/default.pp3 index 5843ae5dd..053fb7827 100644 --- a/rtdata/profiles/default.pp3 +++ b/rtdata/profiles/default.pp3 @@ -1,7 +1,7 @@ [Version] -AppVersion=Dev-3.1m6.89 -Version=300 +AppVersion=4.0.5.7 +Version=301 [General] Rank=0 @@ -10,14 +10,14 @@ InTrash=false [Exposure] Auto=true -Clip=0.0002 +Clip=0 Compensation=0 -Brightness=10 +Brightness=0 Contrast=20 -Saturation=0 +Saturation=5 Black=0 -HighlightCompr=70 -HighlightComprThreshold=30 +HighlightCompr=0 +HighlightComprThreshold=33 ShadowCompr=50 Curve=0; @@ -27,9 +27,9 @@ Green=0;100;0; Blue=0;0;100; [Luminance Curve] -Brightness=-5 +Brightness=0 Contrast=0 -Saturation=20 +Saturation=5 AvoidColorClipping=false SaturationLimiter=false SaturationLimit=40 @@ -53,15 +53,17 @@ DeconvAmount=75 DeconvDamping=20 DeconvIterations=30 -[Clarity] +[SharpenEdge] +Enabled=false +Passes=2 +Strength=50 +ThreeChannels=false + +[SharpenMicro] Enabled=false -Clpasses=2 -Clstrength=50 -Clthreechannels=false -Enabledtwo=false -Mlstrength=20 -Uniformity=50 Matrix=false +Strength=20 +Uniformity=50 [Color Boost] Amount=0 @@ -89,8 +91,8 @@ Threshold=25 [Directional Pyramid Denoising] Enabled=false -Luma=10 -Chroma=10 +Luma=5 +Chroma=5 Gamma=2 LumCurve=0; ChromCurve=0; @@ -131,7 +133,7 @@ HorizontalFlip=false VerticalFlip=false [Common Properties for Transformations] -AutoFill=true +AutoFill=false [Rotation] Degree=0 @@ -156,8 +158,8 @@ CenterX=0 CenterY=0 [HLRecovery] -Enabled=true -Method=Luminance +Enabled=false +Method=Blend [Resize] Enabled=false @@ -170,7 +172,7 @@ Height=2871 [Color Management] InputProfile=(camera) -ApplyGammaBeforeInputProfile=false +BlendCMSMatrix=false WorkingProfile=ProPhoto OutputProfile=No ICM: sRGB output Gammafree=default @@ -178,17 +180,6 @@ Freegamma=false GammaValue=2.22 GammaSlope=4.5 -[Equalizer] -Enabled=false -C0=0 -C1=0 -C2=0 -C3=0 -C4=0 -C5=0 -C6=0 -C7=0 - [Directional Pyramid Equalizer] Enabled=true Mult0=3 @@ -209,7 +200,7 @@ FlatFieldFile= FlatFieldAutoSelect=false FlatFieldBlurRadius=32 FlatFieldBlurType=Area Flatfield -CA=true +CA=false CARed=0 CABlue=0 HotDeadPixels=false @@ -221,7 +212,7 @@ Method=amaze DCBIterations=2 DCBEnhance=false ALLEnhance=false -PreExposure=0.99999999999999956 +PreExposure=1 PrePreserv=0 PreBlackzero=0 PreBlackone=0 diff --git a/rtdata/profiles/neutral.pp3 b/rtdata/profiles/neutral.pp3 index c1a6b5b9d..297d33b39 100644 --- a/rtdata/profiles/neutral.pp3 +++ b/rtdata/profiles/neutral.pp3 @@ -1,7 +1,7 @@ [Version] -AppVersion=Dev-3.1m6.89 -Version=300 +AppVersion=4.0.5.7 +Version=301 [General] Rank=0 @@ -10,7 +10,7 @@ InTrash=false [Exposure] Auto=false -Clip=0.0002 +Clip=0.0000 Compensation=0 Brightness=0 Contrast=0 @@ -53,15 +53,17 @@ DeconvAmount=75 DeconvDamping=20 DeconvIterations=30 -[Clarity] +[SharpenEdge] +Enabled=false +Passes=2 +Strength=50 +ThreeChannels=false + +[SharpenMicro] Enabled=false -Clpasses=2 -Clstrength=50 -Clthreechannels=false -Enabledtwo=false -Mlstrength=20 -Uniformity=50 Matrix=false +Strength=20 +Uniformity=50 [Color Boost] Amount=0 @@ -89,8 +91,8 @@ Threshold=25 [Directional Pyramid Denoising] Enabled=false -Luma=10 -Chroma=10 +Luma=5 +Chroma=5 Gamma=2 LumCurve=0; ChromCurve=0; @@ -107,9 +109,9 @@ Amount=20 [Shadows & Highlights] Enabled=false HighQuality=false -Highlights=0 +Highlights=10 HighlightTonalWidth=80 -Shadows=0 +Shadows=10 ShadowTonalWidth=80 LocalContrast=0 Radius=30 @@ -131,7 +133,7 @@ HorizontalFlip=false VerticalFlip=false [Common Properties for Transformations] -AutoFill=true +AutoFill=false [Rotation] Degree=0 @@ -157,7 +159,7 @@ CenterY=0 [HLRecovery] Enabled=false -Method=CIELab blending +Method=Blend [Resize] Enabled=false @@ -170,7 +172,7 @@ Height=2836 [Color Management] InputProfile=(camera) -ApplyGammaBeforeInputProfile=false +BlendCMSMatrix=false WorkingProfile=Adobe RGB OutputProfile=No ICM: sRGB output Gammafree=default @@ -178,24 +180,13 @@ Freegamma=false GammaValue=2.22 GammaSlope=4.5 -[Equalizer] -Enabled=false -C0=0 -C1=0 -C2=0 -C3=0 -C4=0 -C5=0 -C6=0 -C7=0 - [Directional Pyramid Equalizer] Enabled=false Mult0=1 Mult1=1 Mult2=1 Mult3=1 -Mult4=0 +Mult4=0.2 [HSV Equalizer] HCurve=0; diff --git a/rtengine/curves.cc b/rtengine/curves.cc index 40d77794f..225fa750d 100644 --- a/rtengine/curves.cc +++ b/rtengine/curves.cc @@ -298,10 +298,10 @@ namespace rtengine { brightcurvePoints.push_back(0.7); //shoulder point brightcurvePoints.push_back(MIN(1.0,0.7+br/300.0)); //value at shoulder point } else { - brightcurvePoints.push_back(0.1-br/150.0); //toe point + brightcurvePoints.push_back(MAX(0.0,0.1-br/150.0)); //toe point brightcurvePoints.push_back(0.1); //value at toe point - brightcurvePoints.push_back(MIN(1.0,0.7-br/300.0)); //shoulder point + brightcurvePoints.push_back(0.7-br/300.0); //shoulder point brightcurvePoints.push_back(0.7); //value at shoulder point } brightcurvePoints.push_back(1.); // white point @@ -326,9 +326,8 @@ namespace rtengine { if (comp>0.0) { if (val>0.0) { - float Y = val*exp_scale/(scale-shoulder); float R = val*comp/(scale-shoulder); - hlCurve[i] = log(1.0+Y*comp)/R; + hlCurve[i] = log(1.0+R*exp_scale)/R; } else { hlCurve[i]=exp_scale; } @@ -379,7 +378,8 @@ namespace rtengine { //double sqavg = 0; for (int i=0; i<=0xffff; i++) { float fi=i; - avg += dcurve[shCurve[hlCurve[i]*fi]*fi] * histogram[i]; + fi = hlCurve[fi]*fi; + avg += dcurve[(int)(shCurve[fi]*fi)] * histogram[i]; //sqavg += dcurve[i]*dcurve[i] * histogram[i]; sum += histogram[i]; } diff --git a/rtengine/improccoordinator.cc b/rtengine/improccoordinator.cc index 2f3b2f1cb..f944a65d8 100644 --- a/rtengine/improccoordinator.cc +++ b/rtengine/improccoordinator.cc @@ -21,6 +21,7 @@ #include #include #include +#include "ppversion.h" #define CLIPTO(a,b,c) ((a)>b?((a)0?((a)<65535?(a):65535):0) @@ -204,11 +205,13 @@ void ImProcCoordinator::updatePreviewImage (int todo, Crop* cropCall) { if (todo & M_AUTOEXP) { if (params.toneCurve.autoexp) { - LUTu aehist; int aehistcompr; - imgsrc->getAutoExpHistogram (aehist, aehistcompr); - ipf.getAutoExp (aehist, aehistcompr, imgsrc->getDefGain(), params.toneCurve.clip, params.toneCurve.expcomp, params.toneCurve.black); - if (aeListener) - aeListener->autoExpChanged (params.toneCurve.expcomp, params.toneCurve.black); + LUTu aehist; int aehistcompr; + imgsrc->getAutoExpHistogram (aehist, aehistcompr); + ipf.getAutoExp (aehist, aehistcompr, imgsrc->getDefGain(), params.toneCurve.clip, params.toneCurve.expcomp, + params.toneCurve.brightness, params.toneCurve.contrast, params.toneCurve.black, params.toneCurve.hlcompr, params.toneCurve.hlcomprthresh); + if (aeListener) + aeListener->autoExpChanged (params.toneCurve.expcomp, params.toneCurve.brightness, params.toneCurve.contrast, \ + params.toneCurve.black, params.toneCurve.hlcompr,params.toneCurve.hlcomprthresh); } } diff --git a/rtengine/improcfun.cc b/rtengine/improcfun.cc index f76bd1adb..7c83f54da 100644 --- a/rtengine/improcfun.cc +++ b/rtengine/improcfun.cc @@ -616,56 +616,169 @@ void ImProcFunctions::colorCurve (LabImage* lold, LabImage* lnew) { } } - void ImProcFunctions::getAutoExp (LUTu & histogram, int histcompr, double expcomp, double clip, double& br, int& bl) { + void ImProcFunctions::getAutoExp (LUTu & histogram, int histcompr, double defgain, double clip, \ + double& expcomp, int& bright, int& contr, int& black, int& hlcompr, int& hlcomprthresh) { - double sum = 0; - for (int i=0; i<65536>>histcompr; i++) + double corr = 1;//pow(2.0, defgain);//defgain may be redundant legacy of superceded code??? + float scale = 65536.0; + float midgray=0.18445f;//middle gray in linear gamma = 0.18445*65535 + + int imax=65536>>histcompr; + + float sum = 0, hisum=0, losum=0; + float ave = 0, hidev=0, lodev=0; + //find average luminance + for (int i=0; i>histcompr) - 1; - while (aw>1 && histogram[aw]+clipped <= clippable) { - clipped += histogram[aw]; - aw--; + //find median of luminance + int median=0, count=0; + while (countsum/8) { + octile[count]=log(1+i)/log(2); + count = MIN(count+1,7); + } + if (i2 ? (octile[i+1]-octile[3]) : (octile[3]-octile[i]))); + } + ospread /= 5; + + // compute clipping points based on the original histograms (linear, without exp comp.) + int clipped = 0; + int rawmax = (imax) - 1; + while (rawmax>1 && histogram[rawmax]+clipped <= 0) { + clipped += histogram[rawmax]; + rawmax--; + } + + //compute clipped white point + int clippable = (int)(sum * clip); + clipped = 0; + int whiteclip = (imax) - 1; + while (whiteclip>1 && histogram[whiteclip]+clipped <= clippable) { + clipped += histogram[whiteclip]; + whiteclip--; + } + + //compute clipped black point clipped = 0; int shc = 0; - while (shc>histcompr; i++) gavg += histogram[i] * CurveFactory::gamma2((int)(corr*(i<10.0) br=10.0; + black = (int)((65535*black)/whiteclipg); + expcomp = log(65535.0 / (whiteclipg)) / log(2.0); + + if (expcomp<0.0) expcomp = 0.0;*/ + + if (expcomp>10.0) expcomp=10.0; } //%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% diff --git a/rtengine/improcfun.h b/rtengine/improcfun.h index c8ab7b108..c238b9801 100644 --- a/rtengine/improcfun.h +++ b/rtengine/improcfun.h @@ -155,7 +155,7 @@ class ImProcFunctions { bool transCoord (int W, int H, int x, int y, int w, int h, int& xv, int& yv, int& wv, int& hv, double ascaleDef = -1); bool transCoord (int W, int H, std::vector &src, std::vector &red, std::vector &green, std::vector &blue, double ascaleDef = -1); - void getAutoExp (LUTu & histogram, int histcompr, double expcomp, double clip, double& br, int& bl); + void getAutoExp (LUTu & histogram, int histcompr, double defgain, double clip, double& expcomp, int& bright, int& contr, int& black, int& hlcompr, int& hlcomprthresh); static double getAutoDistor (const Glib::ustring& fname, int thumb_size); double getTransformAutoFill (int oW, int oH); diff --git a/rtengine/procparams.cc b/rtengine/procparams.cc index 13acd6578..1401aed2f 100644 --- a/rtengine/procparams.cc +++ b/rtengine/procparams.cc @@ -29,6 +29,7 @@ #include #include +#include "ppversion.h" #define APPVERSION VERSION namespace rtengine { @@ -598,6 +599,7 @@ if (keyFile.has_group ("Version")) { if (keyFile.has_key ("Version", "AppVersion")) appVersion = keyFile.get_string ("Version", "AppVersion"); if (keyFile.has_key ("Version", "Version")) ppVersion = keyFile.get_integer ("Version", "Version"); } +//printf("ProcParams::load called ppVersion=%i\n",ppVersion); if (keyFile.has_group ("General")) { if (keyFile.has_key ("General", "Rank")) rank = keyFile.get_integer ("General", "Rank"); @@ -606,7 +608,11 @@ if (keyFile.has_group ("General")) { } if (keyFile.has_group ("Exposure")) { - if (keyFile.has_key ("Exposure", "Auto")) toneCurve.autoexp = keyFile.get_boolean ("Exposure", "Auto"); + if (ppVersion #include #include "jpeg.h" +#include "ppversion.h" #define MAXVAL 0xffff #define CLIP(a) ((a)>0?((a) #include #include +#include "ppversion.h" #undef THREAD_PRIORITY_NORMAL #define CLIP(a) ((a)>0?((a)<65535?(a):65535):0) @@ -110,6 +111,7 @@ IImage16* processImage (ProcessingJob* pjob, int& errorCode, ProgressListener* p imgsrc->getImage (currWB, tr, baseImg, pp, params.hlrecovery, params.icm, params.raw); if (pl) pl->setProgress (0.45); + // perform first analysis LUTu hist16 (65536); ipf.firstAnalysis (baseImg, ¶ms, hist16, imgsrc->getGamma()); @@ -135,13 +137,18 @@ IImage16* processImage (ProcessingJob* pjob, int& errorCode, ProgressListener* p } // RGB processing //!!!// auto exposure!!! - double br = params.toneCurve.expcomp; - int bl = params.toneCurve.black; + double expcomp = params.toneCurve.expcomp; + int bright = params.toneCurve.brightness; + int contr = params.toneCurve.contrast; + int black = params.toneCurve.black; + int hlcompr = params.toneCurve.hlcompr; + int hlcomprthresh = params.toneCurve.hlcomprthresh; if (params.toneCurve.autoexp) { - LUTu aehist; int aehistcompr; - imgsrc->getAutoExpHistogram (aehist, aehistcompr); - ipf.getAutoExp (aehist, aehistcompr, imgsrc->getDefGain(), params.toneCurve.clip, br, bl); + printf("silpleprocess calling autoexp\n"); + LUTu aehist; int aehistcompr; + imgsrc->getAutoExpHistogram (aehist, aehistcompr); + ipf.getAutoExp (aehist, aehistcompr, imgsrc->getDefGain(), params.toneCurve.clip, expcomp, bright, contr, black, hlcompr,hlcomprthresh); } // at this stage, we can flush the raw data to free up quite an important amount of memory @@ -156,7 +163,7 @@ IImage16* processImage (ProcessingJob* pjob, int& errorCode, ProgressListener* p LUTf satcurve (65536,0); LUTu dummy; - CurveFactory::complexCurve (br, bl/65535.0, params.toneCurve.hlcompr, params.toneCurve.hlcomprthresh, params.toneCurve.shcompr, params.toneCurve.brightness, params.toneCurve.contrast, imgsrc->getGamma(), true, params.toneCurve.curve, + CurveFactory::complexCurve (expcomp, black/65535.0, params.toneCurve.hlcompr, params.toneCurve.hlcomprthresh, params.toneCurve.shcompr, bright, params.toneCurve.contrast, imgsrc->getGamma(), true, params.toneCurve.curve, hist16, dummy, curve1, curve2, curve, dummy); LabImage* labView = new LabImage (fw,fh); diff --git a/rtgui/ppversion.h b/rtgui/ppversion.h index 8a98f48b2..9320113c9 100644 --- a/rtgui/ppversion.h +++ b/rtgui/ppversion.h @@ -2,6 +2,7 @@ #define _PPVERSION_ // This number have to be incremented whenever the PP3 file format is modified -#define PPVERSION 300 +#define PPVERSION 301 +#define PPVERSION_AEXP 301 //value of PPVERSION when auto exposure algorithm was modified #endif diff --git a/rtgui/tonecurve.cc b/rtgui/tonecurve.cc index d1eae4c7d..30f7adc63 100644 --- a/rtgui/tonecurve.cc +++ b/rtgui/tonecurve.cc @@ -20,6 +20,7 @@ #include #include #include +#include "ppversion.h" using namespace rtengine; using namespace rtengine::procparams; @@ -207,7 +208,7 @@ void ToneCurve::curveChanged () { void ToneCurve::adjusterChanged (Adjuster* a, double newval) { // Switch off auto exposure if user changes sliders manually - if (autolevels->get_active() && (a==expcomp || a==black)) { + if (autolevels->get_active() && (a==expcomp || a==brightness || a==contrast || a==black || a==hlcompr || a==hlcomprthresh)) { autolevels->set_active (false); autolevels->set_inconsistent (false); } @@ -264,11 +265,23 @@ void ToneCurve::autolevels_toggled () { if (batchMode) { expcomp->setEditedState (UnEdited); + brightness->setEditedState (UnEdited); + contrast->setEditedState (UnEdited); black->setEditedState (UnEdited); + hlcompr->setEditedState (UnEdited); + hlcomprthresh->setEditedState (UnEdited); if (expcomp->getAddMode()) expcomp->setValue (0); - if (black->getAddMode()) + if (brightness->getAddMode()) + brightness->setValue (0); + if (contrast->getAddMode()) + contrast->setValue (0); + if (black->getAddMode()) black->setValue (0); + if (hlcompr->getAddMode()) + hlcompr->setValue (0); + if (hlcomprthresh->getAddMode()) + hlcomprthresh->setValue (0); listener->panelChanged (EvAutoExp, M("GENERAL_ENABLED")); } } @@ -295,6 +308,7 @@ void ToneCurve::waitForAutoExp () { sclip->set_sensitive (false); expcomp->setEnabled (false); brightness->setEnabled (false); + contrast->setEnabled (false); black->setEnabled (false); hlcompr->setEnabled (false); hlcomprthresh->setEnabled (false); @@ -309,10 +323,14 @@ int autoExpChangedUI (void* data) { return 0; } -void ToneCurve::autoExpChanged (double expcomp, int black) { +void ToneCurve::autoExpChanged (double expcomp, int bright, int contr, int black, int hlcompr, int hlcomprthresh) { nextBlack = black; nextExpcomp = expcomp; + nextBrightness = bright; + nextContrast = contr; + nextHlcompr = hlcompr; + nextHlcomprthresh = hlcomprthresh; g_idle_add (autoExpChangedUI, this); // Glib::signal_idle().connect (sigc::mem_fun(*this, &ToneCurve::autoExpComputed_)); @@ -337,7 +355,11 @@ bool ToneCurve::autoExpComputed_ () { disableListener (); enableAll (); expcomp->setValue (nextExpcomp); + brightness->setValue (nextBrightness); + contrast->setValue (nextContrast); black->setValue (nextBlack); + hlcompr->setValue (nextHlcompr); + hlcomprthresh->setValue (nextHlcomprthresh); if (!black->getAddMode()) shcompr->set_sensitive(!((int)black->getValue ()==0)); //at black=0 shcompr value has no effect enableListener (); diff --git a/rtgui/tonecurve.h b/rtgui/tonecurve.h index 0b39ee7e4..bb9ec1bf2 100644 --- a/rtgui/tonecurve.h +++ b/rtgui/tonecurve.h @@ -49,7 +49,11 @@ class ToneCurve : public Gtk::VBox, public AdjusterListener, public FoldableTool // used temporarily in eventing double nextExpcomp; + int nextBrightness; + int nextContrast; int nextBlack; + int nextHlcompr; + int nextHlcomprthresh; public: @@ -68,7 +72,7 @@ class ToneCurve : public Gtk::VBox, public AdjusterListener, public FoldableTool void clip_changed (); bool clip_changed_ (); void waitForAutoExp (); - void autoExpChanged (double br, int bl); + void autoExpChanged (double expcomp, int bright, int contr, int black, int hlcompr, int hlcomprthresh); bool autoExpComputed_ (); void enableAll (); void curveChanged ();