From 0af80b16d4d98fdaca1b942a46b33e4145c365ba Mon Sep 17 00:00:00 2001 From: DrSlony Date: Thu, 23 Oct 2014 23:13:41 +0200 Subject: [PATCH] Update to defaults and re-generated some bundled profiles to make better use of modern tools --- rtdata/profiles/BW/BW 1.pp3 | 2 +- rtdata/profiles/BW/BW 2.pp3 | 2 +- rtdata/profiles/BW/BW 3.pp3 | 2 +- rtdata/profiles/BW/BW 4.pp3 | 2 +- rtdata/profiles/Default ISO High.pp3 | 140 ++++++----------- rtdata/profiles/Default ISO Medium.pp3 | 138 ++++++----------- rtdata/profiles/Default.pp3 | 133 ++++++---------- .../Faded/Faded Amber 1 TM Bright.pp3 | 2 +- rtdata/profiles/Faded/Faded Amber 1 TM.pp3 | 2 +- rtdata/profiles/Faded/Faded Amber 1.pp3 | 2 +- .../profiles/Faded/Faded Blue 1 TM Bright.pp3 | 2 +- rtdata/profiles/Faded/Faded Blue 1 TM.pp3 | 2 +- rtdata/profiles/Faded/Faded Blue 1.pp3 | 2 +- rtdata/profiles/Faded/Faded Blue Pink TM.pp3 | 2 +- rtdata/profiles/Faded/Faded Blue Pink.pp3 | 2 +- .../Faded/Faded Chocolate 1 TM Bright.pp3 | 2 +- .../Faded/Faded Chocolate 2 TM Bright.pp3 | 2 +- rtdata/profiles/Faded/Faded Golden 1.pp3 | 2 +- rtdata/profiles/Faded/Faded Golden 2.pp3 | 2 +- .../Faded/Faded Green 1 TM Bright.pp3 | 2 +- rtdata/profiles/Faded/Faded Green 1 TM.pp3 | 2 +- rtdata/profiles/Faded/Faded Green 1.pp3 | 2 +- rtdata/profiles/Faded/Faded Green 2.pp3 | 2 +- rtdata/profiles/Faded/Faded Green 3.pp3 | 2 +- rtdata/profiles/Faded/Faded Neutral TM.pp3 | 2 +- rtdata/profiles/Faded/Faded Neutral.pp3 | 2 +- .../Faded/Faded Purple 1 TM Bright.pp3 | 2 +- rtdata/profiles/Faded/Faded Purple 1 TM.pp3 | 2 +- rtdata/profiles/Faded/Faded Purple 1.pp3 | 2 +- rtdata/profiles/Faded/Faded Purple 2 TM.pp3 | 2 +- rtdata/profiles/Faded/Faded Purple 2.pp3 | 2 +- .../Faded/Faded Teal Orange TM Bright.pp3 | 2 +- .../profiles/Faded/Faded Teal Orange TM.pp3 | 2 +- rtdata/profiles/Faded/Faded Teal Orange.pp3 | 2 +- .../profiles/Faded/Faded Warm 1 TM Bright.pp3 | 2 +- rtdata/profiles/Faded/Faded Warm 1 TM.pp3 | 2 +- rtdata/profiles/Faded/Faded Warm 1.pp3 | 2 +- rtdata/profiles/Faded/Faded Warm 2.pp3 | 2 +- rtdata/profiles/Faded/Faded Warm 3.pp3 | 2 +- rtdata/profiles/Generic/Deep Shadows.pp3 | 2 +- rtdata/profiles/Generic/Equilibrated.pp3 | 2 +- rtdata/profiles/Generic/High-Key.pp3 | 2 +- rtdata/profiles/Generic/Natural 1.pp3 | 2 +- rtdata/profiles/Generic/Natural 2.pp3 | 2 +- rtdata/profiles/Generic/Punchy 1.pp3 | 2 +- rtdata/profiles/Generic/Punchy 2.pp3 | 2 +- rtdata/profiles/Pop/Pop 1.pp3 | 60 ++------ rtdata/profiles/Pop/Pop 2 L.pp3 | 58 ++----- rtdata/profiles/Pop/Pop 3 Skin.pp3 | 62 ++------ rtdata/profiles/Pop/Pop 4 BW.pp3 | 42 ++--- rtdata/profiles/Portrait/Portrait Lejto.pp3 | 2 +- rtdata/profiles/Portrait/Portrait Smooth.pp3 | 143 ++++++++---------- .../Skintones/Skintones - Natural TM.pp3 | 2 +- .../Skintones/Skintones - Natural.pp3 | 2 +- .../Skintones/Skintones - Pale TM Bright.pp3 | 2 +- .../Skintones/Skintones - Pale TM.pp3 | 2 +- .../profiles/Skintones/Skintones - Pale.pp3 | 2 +- .../Skintones/Skintones - Soft Texture.pp3 | 2 +- .../Skintones/Skintones - Strong Texture.pp3 | 2 +- .../Skintones/Skintones - Studio TM.pp3 | 2 +- .../profiles/Skintones/Skintones - Studio.pp3 | 2 +- .../Skintones/Skintones - StudioBase 1 TM.pp3 | 2 +- .../Skintones/Skintones - StudioBase 1.pp3 | 2 +- rtgui/main.cc | 4 +- rtgui/options.cc | 10 +- 65 files changed, 326 insertions(+), 574 deletions(-) diff --git a/rtdata/profiles/BW/BW 1.pp3 b/rtdata/profiles/BW/BW 1.pp3 index 3dce4a89d..0b49bd016 100644 --- a/rtdata/profiles/BW/BW 1.pp3 +++ b/rtdata/profiles/BW/BW 1.pp3 @@ -1,5 +1,5 @@ [Version] -AppVersion=4.1.50 +AppVersion=4.2.1 Version=321 [Exposure] diff --git a/rtdata/profiles/BW/BW 2.pp3 b/rtdata/profiles/BW/BW 2.pp3 index d47dadc62..b7182596c 100644 --- a/rtdata/profiles/BW/BW 2.pp3 +++ b/rtdata/profiles/BW/BW 2.pp3 @@ -1,5 +1,5 @@ [Version] -AppVersion=4.1.50 +AppVersion=4.2.1 Version=321 [Exposure] diff --git a/rtdata/profiles/BW/BW 3.pp3 b/rtdata/profiles/BW/BW 3.pp3 index 027b111ff..117e45257 100644 --- a/rtdata/profiles/BW/BW 3.pp3 +++ b/rtdata/profiles/BW/BW 3.pp3 @@ -1,5 +1,5 @@ [Version] -AppVersion=4.1.50 +AppVersion=4.2.1 Version=321 [Exposure] diff --git a/rtdata/profiles/BW/BW 4.pp3 b/rtdata/profiles/BW/BW 4.pp3 index 8ef154def..2c122819d 100644 --- a/rtdata/profiles/BW/BW 4.pp3 +++ b/rtdata/profiles/BW/BW 4.pp3 @@ -1,5 +1,5 @@ [Version] -AppVersion=4.1.50 +AppVersion=4.2.1 Version=321 [Exposure] diff --git a/rtdata/profiles/Default ISO High.pp3 b/rtdata/profiles/Default ISO High.pp3 index 296063c70..1369276e1 100644 --- a/rtdata/profiles/Default ISO High.pp3 +++ b/rtdata/profiles/Default ISO High.pp3 @@ -1,11 +1,11 @@ [Version] -AppVersion=4.1.50 +AppVersion=4.2.1 Version=321 [Exposure] Auto=true Clip=0.02 -Saturation=5 +Saturation=0 CurveMode=Standard CurveMode2=Standard Curve=0; @@ -22,32 +22,11 @@ Blue=0;0;100; [Black & White] Enabled=false -Method=Desaturation -Auto=false -ComplementaryColors=true -Setting=NormalContrast -Filter=None -MixerRed=43 -MixerOrange=33 -MixerYellow=33 -MixerGreen=33 -MixerCyan=33 -MixerBlue=30 -MixerMagenta=33 -MixerPurple=33 -GammaRed=0 -GammaGreen=0 -GammaBlue=0 -LuminanceCurve=0; -BeforeCurveMode=Standard -AfterCurveMode=Standard -BeforeCurve=0; -AfterCurve=0; [Luminance Curve] Brightness=0 Contrast=0 -Chromaticity=5 +Chromaticity=0 AvoidColorShift=false RedAndSkinTonesProtection=0 LCredsk=true @@ -64,8 +43,8 @@ ClCurve=0; [Sharpening] Enabled=false Method=usm -Radius=0.8 -Amount=125 +Radius=0.7 +Amount=250 Threshold=20;80;2000;1200; OnlyEdges=false EdgedetectionRadius=1.9 @@ -79,93 +58,55 @@ DeconvIterations=30 [Vibrance] Enabled=false -Pastels=50 -Saturated=50 -PSThreshold=0;75; -ProtectSkins=false -AvoidColorShift=false -PastSatTog=true -SkinTonesCurve=0; + +[SharpenEdge] +Enabled=false + +[SharpenMicro] +Enabled=false + +[White Balance] +Setting=Camera +Equal=1 [Color appearance] Enabled=false -Degree=90 -AutoDegree=true -Surround=Average -AdaptLum=16 -Badpixsl=0 -Model=RawT -Algorithm=JC -J-Light=0 -Q-Bright=0 -C-Chroma=0 -S-Chroma=0 -M-Chroma=0 -J-Contrast=0 -Q-Contrast=0 -H-Hue=0 -RSTProtection=0 -AdaptScene=2000 -AutoAdapscen=true -SurrSource=false -Gamut=true -Datacie=false -Tonecie=false -CurveMode=Lightness -CurveMode2=Lightness -CurveMode3=Chroma -Curve=0; -Curve2=0; -Curve3=0; + +[Impulse Denoising] +Enabled=false + +[Defringing] +Enabled=false [Directional Pyramid Denoising] Enabled=true -Enhance=true -Median=false +Enhance=false +Median=true Luma=0 Ldetail=50 -Chroma=50 -Method=RGB +Chroma=30 +Method=Lab SMethod=shal -MedMethod=soft +MedMethod=33 RGBMethod=soft -MethodMed=Lonly +MethodMed=Lab Redchro=0 Bluechro=0 Gamma=1.7 -Passes=1 -LCurve=1;0.053;0.55;0.35;0.35;0.62;0.04;0.35;0.35; +Passes=3 +LCurve=1;0.05;0.5;0.35;0.35;0.55;0.04;0.35;0.35; [EPD] Enabled=false -Strength=0.25 -EdgeStopping=1.4 -Scale=1 -ReweightingIterates=0 [Shadows & Highlights] Enabled=false -HighQuality=false -Highlights=10 -HighlightTonalWidth=80 -Shadows=10 -ShadowTonalWidth=80 -LocalContrast=0 -Radius=30 [Gradient] Enabled=false -Degree=0 -Feather=25 -Strength=0.6 -CenterX=0 -CenterY=0 [PCVignette] Enabled=false -Strength=0.6 -Feather=50 -Roundness=50 [HSV Equalizer] HCurve=0; @@ -185,14 +126,33 @@ bCurve=0; Enabled=false [RAW] +DarkFrame=/szeva +DarkFrameAuto=false +FlatFieldFile=/szeva +FlatFieldAutoSelect=false CA=true -HotDeadPixels=true +HotPixelFilter=true +DeadPixelFilter=false HotDeadPixelThresh=40 [RAW Bayer] -Method=igv +Method=lmmse CcSteps=0 +PreBlack0=0 +PreBlack1=0 +PreBlack2=0 +PreBlack3=0 +PreTwoGreen=true +LineDenoise=0 +GreenEqThreshold=0 +DCBIterations=2 +DCBEnhance=false +LMMSEIterations=2 [RAW X-Trans] Method=3-pass (best) CcSteps=0 +PreBlackRed=0 +PreBlackGreen=0 +PreBlackBlue=0 + diff --git a/rtdata/profiles/Default ISO Medium.pp3 b/rtdata/profiles/Default ISO Medium.pp3 index b5cac262b..ba2783b78 100644 --- a/rtdata/profiles/Default ISO Medium.pp3 +++ b/rtdata/profiles/Default ISO Medium.pp3 @@ -1,11 +1,11 @@ [Version] -AppVersion=4.1.50 +AppVersion=4.2.1 Version=321 [Exposure] Auto=true Clip=0.02 -Saturation=5 +Saturation=0 CurveMode=Standard CurveMode2=Standard Curve=0; @@ -22,32 +22,11 @@ Blue=0;0;100; [Black & White] Enabled=false -Method=Desaturation -Auto=false -ComplementaryColors=true -Setting=NormalContrast -Filter=None -MixerRed=43 -MixerOrange=33 -MixerYellow=33 -MixerGreen=33 -MixerCyan=33 -MixerBlue=30 -MixerMagenta=33 -MixerPurple=33 -GammaRed=0 -GammaGreen=0 -GammaBlue=0 -LuminanceCurve=0; -BeforeCurveMode=Standard -AfterCurveMode=Standard -BeforeCurve=0; -AfterCurve=0; [Luminance Curve] Brightness=0 Contrast=0 -Chromaticity=5 +Chromaticity=0 AvoidColorShift=false RedAndSkinTonesProtection=0 LCredsk=true @@ -64,8 +43,8 @@ ClCurve=0; [Sharpening] Enabled=true Method=usm -Radius=0.8 -Amount=150 +Radius=0.7 +Amount=250 Threshold=20;80;2000;1200; OnlyEdges=false EdgedetectionRadius=1.9 @@ -79,93 +58,55 @@ DeconvIterations=30 [Vibrance] Enabled=false -Pastels=50 -Saturated=50 -PSThreshold=0;75; -ProtectSkins=false -AvoidColorShift=false -PastSatTog=true -SkinTonesCurve=0; + +[SharpenEdge] +Enabled=false + +[SharpenMicro] +Enabled=false + +[White Balance] +Setting=Camera +Equal=1 [Color appearance] Enabled=false -Degree=90 -AutoDegree=true -Surround=Average -AdaptLum=16 -Badpixsl=0 -Model=RawT -Algorithm=JC -J-Light=0 -Q-Bright=0 -C-Chroma=0 -S-Chroma=0 -M-Chroma=0 -J-Contrast=0 -Q-Contrast=0 -H-Hue=0 -RSTProtection=0 -AdaptScene=2000 -AutoAdapscen=true -SurrSource=false -Gamut=true -Datacie=false -Tonecie=false -CurveMode=Lightness -CurveMode2=Lightness -CurveMode3=Chroma -Curve=0; -Curve2=0; -Curve3=0; + +[Impulse Denoising] +Enabled=false + +[Defringing] +Enabled=false [Directional Pyramid Denoising] Enabled=true -Enhance=true -Median=false +Enhance=false +Median=true Luma=0 -Ldetail=70 +Ldetail=85 Chroma=15 -Method=RGB +Method=Lab SMethod=shal -MedMethod=soft +MedMethod=33 RGBMethod=soft -MethodMed=Lonly +MethodMed=Lab Redchro=0 Bluechro=0 Gamma=1.7 Passes=1 -LCurve=1;0.05;0.30;0.35;0.35;0.55;0.04;0.35;0.35; +LCurve=1;0.05;0.15;0.35;0.35;0.55;0.04;0.35;0.35; [EPD] Enabled=false -Strength=0.25 -EdgeStopping=1.4 -Scale=1 -ReweightingIterates=0 [Shadows & Highlights] Enabled=false -HighQuality=false -Highlights=10 -HighlightTonalWidth=80 -Shadows=10 -ShadowTonalWidth=80 -LocalContrast=0 -Radius=30 [Gradient] Enabled=false -Degree=0 -Feather=25 -Strength=0.6 -CenterX=0 -CenterY=0 [PCVignette] Enabled=false -Strength=0.6 -Feather=50 -Roundness=50 [HSV Equalizer] HCurve=0; @@ -185,14 +126,33 @@ bCurve=0; Enabled=false [RAW] +DarkFrame=/szeva +DarkFrameAuto=false +FlatFieldFile=/szeva +FlatFieldAutoSelect=false CA=true -HotDeadPixels=true +HotPixelFilter=true +DeadPixelFilter=false HotDeadPixelThresh=40 [RAW Bayer] -Method=igv +Method=amaze CcSteps=0 +PreBlack0=0 +PreBlack1=0 +PreBlack2=0 +PreBlack3=0 +PreTwoGreen=true +LineDenoise=0 +GreenEqThreshold=0 +DCBIterations=2 +DCBEnhance=false +LMMSEIterations=2 [RAW X-Trans] Method=3-pass (best) CcSteps=0 +PreBlackRed=0 +PreBlackGreen=0 +PreBlackBlue=0 + diff --git a/rtdata/profiles/Default.pp3 b/rtdata/profiles/Default.pp3 index 87d7c99a8..2049b6e65 100644 --- a/rtdata/profiles/Default.pp3 +++ b/rtdata/profiles/Default.pp3 @@ -1,11 +1,11 @@ [Version] -AppVersion=4.1.50 +AppVersion=4.2.1 Version=321 [Exposure] Auto=true Clip=0.02 -Saturation=10 +Saturation=0 CurveMode=Standard CurveMode2=Standard Curve=0; @@ -22,27 +22,6 @@ Blue=0;0;100; [Black & White] Enabled=false -Method=Desaturation -Auto=false -ComplementaryColors=true -Setting=NormalContrast -Filter=None -MixerRed=43 -MixerOrange=33 -MixerYellow=33 -MixerGreen=33 -MixerCyan=33 -MixerBlue=30 -MixerMagenta=33 -MixerPurple=33 -GammaRed=0 -GammaGreen=0 -GammaBlue=0 -LuminanceCurve=0; -BeforeCurveMode=Standard -AfterCurveMode=Standard -BeforeCurve=0; -AfterCurve=0; [Luminance Curve] Brightness=0 @@ -79,86 +58,41 @@ DeconvIterations=30 [Vibrance] Enabled=false -Pastels=50 -Saturated=50 -PSThreshold=0;75; -ProtectSkins=false -AvoidColorShift=false -PastSatTog=true -SkinTonesCurve=0; + +[SharpenEdge] +Enabled=false + +[SharpenMicro] +Enabled=false + +[White Balance] +Setting=Camera +Equal=1 [Color appearance] Enabled=false -Degree=90 -AutoDegree=true -Surround=Average -AdaptLum=16 -Badpixsl=0 -Model=RawT -Algorithm=JC -J-Light=0 -Q-Bright=0 -C-Chroma=0 -S-Chroma=0 -M-Chroma=0 -J-Contrast=0 -Q-Contrast=0 -H-Hue=0 -RSTProtection=0 -AdaptScene=2000 -AutoAdapscen=true -SurrSource=false -Gamut=true -Datacie=false -Tonecie=false -CurveMode=Lightness -CurveMode2=Lightness -CurveMode3=Chroma -Curve=0; -Curve2=0; -Curve3=0; + +[Impulse Denoising] +Enabled=false + +[Defringing] +Enabled=false [Directional Pyramid Denoising] Enabled=false -Enhance=false -Luma=0 -Ldetail=50 -Chroma=15 -Method=RGB -Redchro=0 -Bluechro=0 -Gamma=1.7 +Method=Lab [EPD] Enabled=false -Strength=0.25 -EdgeStopping=1.4 -Scale=1 -ReweightingIterates=0 [Shadows & Highlights] Enabled=false -HighQuality=false -Highlights=10 -HighlightTonalWidth=80 -Shadows=10 -ShadowTonalWidth=80 -LocalContrast=0 -Radius=30 [Gradient] Enabled=false -Degree=0 -Feather=25 -Strength=0.6 -CenterX=0 -CenterY=0 [PCVignette] Enabled=false -Strength=0.6 -Feather=50 -Roundness=50 [HSV Equalizer] HCurve=0; @@ -178,6 +112,33 @@ bCurve=0; Enabled=false [RAW] +DarkFrame=/szeva +DarkFrameAuto=false +FlatFieldFile=/szeva +FlatFieldAutoSelect=false CA=true -HotDeadPixels=false +HotPixelFilter=true +DeadPixelFilter=false HotDeadPixelThresh=40 + +[RAW Bayer] +Method=amaze +CcSteps=0 +PreBlack0=0 +PreBlack1=0 +PreBlack2=0 +PreBlack3=0 +PreTwoGreen=true +LineDenoise=0 +GreenEqThreshold=0 +DCBIterations=2 +DCBEnhance=false +LMMSEIterations=2 + +[RAW X-Trans] +Method=3-pass (best) +CcSteps=0 +PreBlackRed=0 +PreBlackGreen=0 +PreBlackBlue=0 + diff --git a/rtdata/profiles/Faded/Faded Amber 1 TM Bright.pp3 b/rtdata/profiles/Faded/Faded Amber 1 TM Bright.pp3 index 7ade2d0bc..8d149cc2a 100644 --- a/rtdata/profiles/Faded/Faded Amber 1 TM Bright.pp3 +++ b/rtdata/profiles/Faded/Faded Amber 1 TM Bright.pp3 @@ -1,5 +1,5 @@ [Version] -AppVersion=4.1.50 +AppVersion=4.2.1 Version=321 [Exposure] diff --git a/rtdata/profiles/Faded/Faded Amber 1 TM.pp3 b/rtdata/profiles/Faded/Faded Amber 1 TM.pp3 index 8f12fd64d..dc63a7990 100644 --- a/rtdata/profiles/Faded/Faded Amber 1 TM.pp3 +++ b/rtdata/profiles/Faded/Faded Amber 1 TM.pp3 @@ -1,5 +1,5 @@ [Version] -AppVersion=4.1.50 +AppVersion=4.2.1 Version=321 [Exposure] diff --git a/rtdata/profiles/Faded/Faded Amber 1.pp3 b/rtdata/profiles/Faded/Faded Amber 1.pp3 index 5a2cd82e2..1170d068d 100644 --- a/rtdata/profiles/Faded/Faded Amber 1.pp3 +++ b/rtdata/profiles/Faded/Faded Amber 1.pp3 @@ -1,5 +1,5 @@ [Version] -AppVersion=4.1.50 +AppVersion=4.2.1 Version=321 [Exposure] diff --git a/rtdata/profiles/Faded/Faded Blue 1 TM Bright.pp3 b/rtdata/profiles/Faded/Faded Blue 1 TM Bright.pp3 index 82162bc08..75ec85760 100644 --- a/rtdata/profiles/Faded/Faded Blue 1 TM Bright.pp3 +++ b/rtdata/profiles/Faded/Faded Blue 1 TM Bright.pp3 @@ -1,5 +1,5 @@ [Version] -AppVersion=4.1.50 +AppVersion=4.2.1 Version=321 [Exposure] diff --git a/rtdata/profiles/Faded/Faded Blue 1 TM.pp3 b/rtdata/profiles/Faded/Faded Blue 1 TM.pp3 index 9d6158618..156c3463d 100644 --- a/rtdata/profiles/Faded/Faded Blue 1 TM.pp3 +++ b/rtdata/profiles/Faded/Faded Blue 1 TM.pp3 @@ -1,5 +1,5 @@ [Version] -AppVersion=4.1.50 +AppVersion=4.2.1 Version=321 [Exposure] diff --git a/rtdata/profiles/Faded/Faded Blue 1.pp3 b/rtdata/profiles/Faded/Faded Blue 1.pp3 index 17c9747b5..388f315f1 100644 --- a/rtdata/profiles/Faded/Faded Blue 1.pp3 +++ b/rtdata/profiles/Faded/Faded Blue 1.pp3 @@ -1,5 +1,5 @@ [Version] -AppVersion=4.1.50 +AppVersion=4.2.1 Version=321 [Exposure] diff --git a/rtdata/profiles/Faded/Faded Blue Pink TM.pp3 b/rtdata/profiles/Faded/Faded Blue Pink TM.pp3 index 15e22f329..caba0f349 100644 --- a/rtdata/profiles/Faded/Faded Blue Pink TM.pp3 +++ b/rtdata/profiles/Faded/Faded Blue Pink TM.pp3 @@ -1,5 +1,5 @@ [Version] -AppVersion=4.1.50 +AppVersion=4.2.1 Version=321 [Exposure] diff --git a/rtdata/profiles/Faded/Faded Blue Pink.pp3 b/rtdata/profiles/Faded/Faded Blue Pink.pp3 index 0d229a570..a21eff9bc 100644 --- a/rtdata/profiles/Faded/Faded Blue Pink.pp3 +++ b/rtdata/profiles/Faded/Faded Blue Pink.pp3 @@ -1,5 +1,5 @@ [Version] -AppVersion=4.1.50 +AppVersion=4.2.1 Version=321 [Exposure] diff --git a/rtdata/profiles/Faded/Faded Chocolate 1 TM Bright.pp3 b/rtdata/profiles/Faded/Faded Chocolate 1 TM Bright.pp3 index 3b53cd7e0..223e4fa5c 100644 --- a/rtdata/profiles/Faded/Faded Chocolate 1 TM Bright.pp3 +++ b/rtdata/profiles/Faded/Faded Chocolate 1 TM Bright.pp3 @@ -1,5 +1,5 @@ [Version] -AppVersion=4.1.50 +AppVersion=4.2.1 Version=321 [Exposure] diff --git a/rtdata/profiles/Faded/Faded Chocolate 2 TM Bright.pp3 b/rtdata/profiles/Faded/Faded Chocolate 2 TM Bright.pp3 index 259fca94b..16b496c98 100644 --- a/rtdata/profiles/Faded/Faded Chocolate 2 TM Bright.pp3 +++ b/rtdata/profiles/Faded/Faded Chocolate 2 TM Bright.pp3 @@ -1,5 +1,5 @@ [Version] -AppVersion=4.1.50 +AppVersion=4.2.1 Version=321 [Exposure] diff --git a/rtdata/profiles/Faded/Faded Golden 1.pp3 b/rtdata/profiles/Faded/Faded Golden 1.pp3 index cf8cd6162..199ea14cd 100644 --- a/rtdata/profiles/Faded/Faded Golden 1.pp3 +++ b/rtdata/profiles/Faded/Faded Golden 1.pp3 @@ -1,5 +1,5 @@ [Version] -AppVersion=4.1.50 +AppVersion=4.2.1 Version=321 [Exposure] diff --git a/rtdata/profiles/Faded/Faded Golden 2.pp3 b/rtdata/profiles/Faded/Faded Golden 2.pp3 index 31bb3b11f..6ccb8fde4 100644 --- a/rtdata/profiles/Faded/Faded Golden 2.pp3 +++ b/rtdata/profiles/Faded/Faded Golden 2.pp3 @@ -1,5 +1,5 @@ [Version] -AppVersion=4.1.50 +AppVersion=4.2.1 Version=321 [Exposure] diff --git a/rtdata/profiles/Faded/Faded Green 1 TM Bright.pp3 b/rtdata/profiles/Faded/Faded Green 1 TM Bright.pp3 index 333774463..de7906cca 100644 --- a/rtdata/profiles/Faded/Faded Green 1 TM Bright.pp3 +++ b/rtdata/profiles/Faded/Faded Green 1 TM Bright.pp3 @@ -1,5 +1,5 @@ [Version] -AppVersion=4.1.50 +AppVersion=4.2.1 Version=321 [Exposure] diff --git a/rtdata/profiles/Faded/Faded Green 1 TM.pp3 b/rtdata/profiles/Faded/Faded Green 1 TM.pp3 index 8bdd42855..9066da7ef 100644 --- a/rtdata/profiles/Faded/Faded Green 1 TM.pp3 +++ b/rtdata/profiles/Faded/Faded Green 1 TM.pp3 @@ -1,5 +1,5 @@ [Version] -AppVersion=4.1.50 +AppVersion=4.2.1 Version=321 [Exposure] diff --git a/rtdata/profiles/Faded/Faded Green 1.pp3 b/rtdata/profiles/Faded/Faded Green 1.pp3 index 4c594d5b1..0e1ef9b28 100644 --- a/rtdata/profiles/Faded/Faded Green 1.pp3 +++ b/rtdata/profiles/Faded/Faded Green 1.pp3 @@ -1,5 +1,5 @@ [Version] -AppVersion=4.1.50 +AppVersion=4.2.1 Version=321 [Exposure] diff --git a/rtdata/profiles/Faded/Faded Green 2.pp3 b/rtdata/profiles/Faded/Faded Green 2.pp3 index 41de3ccbe..d8dae42d8 100644 --- a/rtdata/profiles/Faded/Faded Green 2.pp3 +++ b/rtdata/profiles/Faded/Faded Green 2.pp3 @@ -1,5 +1,5 @@ [Version] -AppVersion=4.1.50 +AppVersion=4.2.1 Version=321 [Exposure] diff --git a/rtdata/profiles/Faded/Faded Green 3.pp3 b/rtdata/profiles/Faded/Faded Green 3.pp3 index 227896ee8..6f177dcf5 100644 --- a/rtdata/profiles/Faded/Faded Green 3.pp3 +++ b/rtdata/profiles/Faded/Faded Green 3.pp3 @@ -1,5 +1,5 @@ [Version] -AppVersion=4.1.50 +AppVersion=4.2.1 Version=321 [Exposure] diff --git a/rtdata/profiles/Faded/Faded Neutral TM.pp3 b/rtdata/profiles/Faded/Faded Neutral TM.pp3 index 36cdbcae0..b27b48a50 100644 --- a/rtdata/profiles/Faded/Faded Neutral TM.pp3 +++ b/rtdata/profiles/Faded/Faded Neutral TM.pp3 @@ -1,5 +1,5 @@ [Version] -AppVersion=4.1.50 +AppVersion=4.2.1 Version=321 [Exposure] diff --git a/rtdata/profiles/Faded/Faded Neutral.pp3 b/rtdata/profiles/Faded/Faded Neutral.pp3 index 45937d3b7..217cd022b 100644 --- a/rtdata/profiles/Faded/Faded Neutral.pp3 +++ b/rtdata/profiles/Faded/Faded Neutral.pp3 @@ -1,5 +1,5 @@ [Version] -AppVersion=4.1.50 +AppVersion=4.2.1 Version=321 [Exposure] diff --git a/rtdata/profiles/Faded/Faded Purple 1 TM Bright.pp3 b/rtdata/profiles/Faded/Faded Purple 1 TM Bright.pp3 index 48687bf50..1570cf784 100644 --- a/rtdata/profiles/Faded/Faded Purple 1 TM Bright.pp3 +++ b/rtdata/profiles/Faded/Faded Purple 1 TM Bright.pp3 @@ -1,5 +1,5 @@ [Version] -AppVersion=4.1.50 +AppVersion=4.2.1 Version=321 [Exposure] diff --git a/rtdata/profiles/Faded/Faded Purple 1 TM.pp3 b/rtdata/profiles/Faded/Faded Purple 1 TM.pp3 index 647225420..ae9ce6431 100644 --- a/rtdata/profiles/Faded/Faded Purple 1 TM.pp3 +++ b/rtdata/profiles/Faded/Faded Purple 1 TM.pp3 @@ -1,5 +1,5 @@ [Version] -AppVersion=4.1.50 +AppVersion=4.2.1 Version=321 [Exposure] diff --git a/rtdata/profiles/Faded/Faded Purple 1.pp3 b/rtdata/profiles/Faded/Faded Purple 1.pp3 index 10d318c98..9f9f612cb 100644 --- a/rtdata/profiles/Faded/Faded Purple 1.pp3 +++ b/rtdata/profiles/Faded/Faded Purple 1.pp3 @@ -1,5 +1,5 @@ [Version] -AppVersion=4.1.50 +AppVersion=4.2.1 Version=321 [Exposure] diff --git a/rtdata/profiles/Faded/Faded Purple 2 TM.pp3 b/rtdata/profiles/Faded/Faded Purple 2 TM.pp3 index a5c2833cd..08ff7a764 100644 --- a/rtdata/profiles/Faded/Faded Purple 2 TM.pp3 +++ b/rtdata/profiles/Faded/Faded Purple 2 TM.pp3 @@ -1,5 +1,5 @@ [Version] -AppVersion=4.1.50 +AppVersion=4.2.1 Version=321 [Exposure] diff --git a/rtdata/profiles/Faded/Faded Purple 2.pp3 b/rtdata/profiles/Faded/Faded Purple 2.pp3 index 57deef59f..40882b19f 100644 --- a/rtdata/profiles/Faded/Faded Purple 2.pp3 +++ b/rtdata/profiles/Faded/Faded Purple 2.pp3 @@ -1,5 +1,5 @@ [Version] -AppVersion=4.1.50 +AppVersion=4.2.1 Version=321 [Exposure] diff --git a/rtdata/profiles/Faded/Faded Teal Orange TM Bright.pp3 b/rtdata/profiles/Faded/Faded Teal Orange TM Bright.pp3 index 4c3d6592a..d39974e67 100644 --- a/rtdata/profiles/Faded/Faded Teal Orange TM Bright.pp3 +++ b/rtdata/profiles/Faded/Faded Teal Orange TM Bright.pp3 @@ -1,5 +1,5 @@ [Version] -AppVersion=4.1.50 +AppVersion=4.2.1 Version=321 [Exposure] diff --git a/rtdata/profiles/Faded/Faded Teal Orange TM.pp3 b/rtdata/profiles/Faded/Faded Teal Orange TM.pp3 index 096bfbeac..698dc6d14 100644 --- a/rtdata/profiles/Faded/Faded Teal Orange TM.pp3 +++ b/rtdata/profiles/Faded/Faded Teal Orange TM.pp3 @@ -1,5 +1,5 @@ [Version] -AppVersion=4.1.50 +AppVersion=4.2.1 Version=321 [Exposure] diff --git a/rtdata/profiles/Faded/Faded Teal Orange.pp3 b/rtdata/profiles/Faded/Faded Teal Orange.pp3 index 6a0a2d65d..c61468e34 100644 --- a/rtdata/profiles/Faded/Faded Teal Orange.pp3 +++ b/rtdata/profiles/Faded/Faded Teal Orange.pp3 @@ -1,5 +1,5 @@ [Version] -AppVersion=4.1.50 +AppVersion=4.2.1 Version=321 [Exposure] diff --git a/rtdata/profiles/Faded/Faded Warm 1 TM Bright.pp3 b/rtdata/profiles/Faded/Faded Warm 1 TM Bright.pp3 index 3ab9d32e9..a36023fc5 100644 --- a/rtdata/profiles/Faded/Faded Warm 1 TM Bright.pp3 +++ b/rtdata/profiles/Faded/Faded Warm 1 TM Bright.pp3 @@ -1,5 +1,5 @@ [Version] -AppVersion=4.1.50 +AppVersion=4.2.1 Version=321 [Exposure] diff --git a/rtdata/profiles/Faded/Faded Warm 1 TM.pp3 b/rtdata/profiles/Faded/Faded Warm 1 TM.pp3 index bc405daa3..9cf05370c 100644 --- a/rtdata/profiles/Faded/Faded Warm 1 TM.pp3 +++ b/rtdata/profiles/Faded/Faded Warm 1 TM.pp3 @@ -1,5 +1,5 @@ [Version] -AppVersion=4.1.50 +AppVersion=4.2.1 Version=321 [Exposure] diff --git a/rtdata/profiles/Faded/Faded Warm 1.pp3 b/rtdata/profiles/Faded/Faded Warm 1.pp3 index a96b0a4b1..2aeaa3fa8 100644 --- a/rtdata/profiles/Faded/Faded Warm 1.pp3 +++ b/rtdata/profiles/Faded/Faded Warm 1.pp3 @@ -1,5 +1,5 @@ [Version] -AppVersion=4.1.50 +AppVersion=4.2.1 Version=321 [Exposure] diff --git a/rtdata/profiles/Faded/Faded Warm 2.pp3 b/rtdata/profiles/Faded/Faded Warm 2.pp3 index ec7a07f9f..b2781a423 100644 --- a/rtdata/profiles/Faded/Faded Warm 2.pp3 +++ b/rtdata/profiles/Faded/Faded Warm 2.pp3 @@ -1,5 +1,5 @@ [Version] -AppVersion=4.1.50 +AppVersion=4.2.1 Version=321 [Exposure] diff --git a/rtdata/profiles/Faded/Faded Warm 3.pp3 b/rtdata/profiles/Faded/Faded Warm 3.pp3 index bd88bae97..3e0051a92 100644 --- a/rtdata/profiles/Faded/Faded Warm 3.pp3 +++ b/rtdata/profiles/Faded/Faded Warm 3.pp3 @@ -1,5 +1,5 @@ [Version] -AppVersion=4.1.50 +AppVersion=4.2.1 Version=321 [Exposure] diff --git a/rtdata/profiles/Generic/Deep Shadows.pp3 b/rtdata/profiles/Generic/Deep Shadows.pp3 index 06dad68e6..d2d5116fc 100644 --- a/rtdata/profiles/Generic/Deep Shadows.pp3 +++ b/rtdata/profiles/Generic/Deep Shadows.pp3 @@ -1,5 +1,5 @@ [Version] -AppVersion=4.1.50 +AppVersion=4.2.1 Version=321 [Exposure] diff --git a/rtdata/profiles/Generic/Equilibrated.pp3 b/rtdata/profiles/Generic/Equilibrated.pp3 index bcb437bb6..7858b2c4f 100644 --- a/rtdata/profiles/Generic/Equilibrated.pp3 +++ b/rtdata/profiles/Generic/Equilibrated.pp3 @@ -1,5 +1,5 @@ [Version] -AppVersion=4.1.50 +AppVersion=4.2.1 Version=321 [Exposure] diff --git a/rtdata/profiles/Generic/High-Key.pp3 b/rtdata/profiles/Generic/High-Key.pp3 index 0b32f7b44..0131e268a 100644 --- a/rtdata/profiles/Generic/High-Key.pp3 +++ b/rtdata/profiles/Generic/High-Key.pp3 @@ -1,5 +1,5 @@ [Version] -AppVersion=4.1.50 +AppVersion=4.2.1 Version=321 [Exposure] diff --git a/rtdata/profiles/Generic/Natural 1.pp3 b/rtdata/profiles/Generic/Natural 1.pp3 index 84ec545d7..c9247426f 100644 --- a/rtdata/profiles/Generic/Natural 1.pp3 +++ b/rtdata/profiles/Generic/Natural 1.pp3 @@ -1,5 +1,5 @@ [Version] -AppVersion=4.1.50 +AppVersion=4.2.1 Version=321 [Exposure] diff --git a/rtdata/profiles/Generic/Natural 2.pp3 b/rtdata/profiles/Generic/Natural 2.pp3 index 5f9820490..c4500d669 100644 --- a/rtdata/profiles/Generic/Natural 2.pp3 +++ b/rtdata/profiles/Generic/Natural 2.pp3 @@ -1,5 +1,5 @@ [Version] -AppVersion=4.1.50 +AppVersion=4.2.1 Version=321 [Exposure] diff --git a/rtdata/profiles/Generic/Punchy 1.pp3 b/rtdata/profiles/Generic/Punchy 1.pp3 index ab7ff740f..546d5dcdb 100644 --- a/rtdata/profiles/Generic/Punchy 1.pp3 +++ b/rtdata/profiles/Generic/Punchy 1.pp3 @@ -1,5 +1,5 @@ [Version] -AppVersion=4.1.50 +AppVersion=4.2.1 Version=321 [Exposure] diff --git a/rtdata/profiles/Generic/Punchy 2.pp3 b/rtdata/profiles/Generic/Punchy 2.pp3 index 6f1bbc6ca..e2882490d 100644 --- a/rtdata/profiles/Generic/Punchy 2.pp3 +++ b/rtdata/profiles/Generic/Punchy 2.pp3 @@ -1,5 +1,5 @@ [Version] -AppVersion=4.1.50 +AppVersion=4.2.1 Version=321 [Exposure] diff --git a/rtdata/profiles/Pop/Pop 1.pp3 b/rtdata/profiles/Pop/Pop 1.pp3 index 4c0832d2a..c7d242960 100644 --- a/rtdata/profiles/Pop/Pop 1.pp3 +++ b/rtdata/profiles/Pop/Pop 1.pp3 @@ -1,5 +1,5 @@ [Version] -AppVersion=4.1.50 +AppVersion=4.2.1 Version=321 [Exposure] @@ -15,7 +15,7 @@ HighlightComprThreshold=0 ShadowCompr=50 CurveMode=FilmLike CurveMode2=Standard -Curve=3;0;0;0.084;0;0.187;0.188;0.442;0.576;1;1; +Curve=3;0;0;0.084;0;0.187;0.188;0.442;0.58;1;1; Curve2=0; [HLRecovery] @@ -29,27 +29,6 @@ Blue=0;0;100; [Black & White] Enabled=false -Method=Desaturation -Auto=false -ComplementaryColors=true -Setting=NormalContrast -Filter=None -MixerRed=43 -MixerOrange=33 -MixerYellow=33 -MixerGreen=33 -MixerCyan=33 -MixerBlue=30 -MixerMagenta=33 -MixerPurple=33 -GammaRed=0 -GammaGreen=0 -GammaBlue=0 -LuminanceCurve=0; -BeforeCurveMode=Standard -AfterCurveMode=Standard -BeforeCurve=0; -AfterCurve=0; [Luminance Curve] Brightness=0 @@ -70,17 +49,14 @@ ClCurve=0; [Vibrance] Enabled=false -Pastels=50 -Saturated=50 -PSThreshold=0;75; -ProtectSkins=false -AvoidColorShift=false -PastSatTog=true -SkinTonesCurve=0; + +[White Balance] +Setting=Camera +Equal=1 [Color appearance] Enabled=true -Degree=98 +Degree=100 AutoDegree=true Surround=Average AdaptLum=16 @@ -113,26 +89,14 @@ Curve3=3;0;0;0.08;0.02;0.3;0.5;1;1; Enabled=true Strength=0.25 EdgeStopping=2.4 -Scale=0.1 +Scale=0.10 ReweightingIterates=0 [Shadows & Highlights] Enabled=false -HighQuality=false -Highlights=20 -HighlightTonalWidth=80 -Shadows=20 -ShadowTonalWidth=80 -LocalContrast=0 -Radius=70 [Gradient] Enabled=false -Degree=0 -Feather=25 -Strength=0.6 -CenterX=0 -CenterY=0 [PCVignette] Enabled=true @@ -150,11 +114,15 @@ Enabled=false [RGB Curves] LumaMode=false +rCurve=0; +gCurve=0; +bCurve=0; [ColorToning] Enabled=false [RAW] CA=true -HotDeadPixels=true -HotDeadPixelThresh=40 \ No newline at end of file +HotPixelFilter=true +DeadPixelFilter=false +HotDeadPixelThresh=40 diff --git a/rtdata/profiles/Pop/Pop 2 L.pp3 b/rtdata/profiles/Pop/Pop 2 L.pp3 index 0abb65b1e..0ea56e463 100644 --- a/rtdata/profiles/Pop/Pop 2 L.pp3 +++ b/rtdata/profiles/Pop/Pop 2 L.pp3 @@ -1,5 +1,5 @@ [Version] -AppVersion=4.1.50 +AppVersion=4.2.1 Version=321 [Exposure] @@ -29,27 +29,6 @@ Blue=0;0;100; [Black & White] Enabled=false -Method=Desaturation -Auto=false -ComplementaryColors=true -Setting=NormalContrast -Filter=None -MixerRed=43 -MixerOrange=33 -MixerYellow=33 -MixerGreen=33 -MixerCyan=33 -MixerBlue=30 -MixerMagenta=33 -MixerPurple=33 -GammaRed=0 -GammaGreen=0 -GammaBlue=0 -LuminanceCurve=0; -BeforeCurveMode=Standard -AfterCurveMode=Standard -BeforeCurve=0; -AfterCurve=0; [Luminance Curve] Brightness=0 @@ -70,13 +49,10 @@ ClCurve=0; [Vibrance] Enabled=false -Pastels=50 -Saturated=50 -PSThreshold=0;75; -ProtectSkins=false -AvoidColorShift=false -PastSatTog=true -SkinTonesCurve=0; + +[White Balance] +Setting=Camera +Equal=1 [Color appearance] Enabled=true @@ -96,7 +72,7 @@ J-Contrast=0 Q-Contrast=0 H-Hue=0 RSTProtection=0 -AdaptScene=6050 +AdaptScene=208 AutoAdapscen=true SurrSource=false Gamut=true @@ -113,26 +89,14 @@ Curve3=3;0;0;0.08;0.02;0.3;0.5;1;1; Enabled=true Strength=0.25 EdgeStopping=2.4 -Scale=0.1 +Scale=0.10 ReweightingIterates=0 [Shadows & Highlights] Enabled=false -HighQuality=false -Highlights=20 -HighlightTonalWidth=80 -Shadows=20 -ShadowTonalWidth=80 -LocalContrast=0 -Radius=70 [Gradient] Enabled=false -Degree=0 -Feather=25 -Strength=0.6 -CenterX=0 -CenterY=0 [PCVignette] Enabled=true @@ -150,11 +114,15 @@ Enabled=false [RGB Curves] LumaMode=false +rCurve=0; +gCurve=0; +bCurve=0; [ColorToning] Enabled=false [RAW] CA=true -HotDeadPixels=true -HotDeadPixelThresh=40 \ No newline at end of file +HotPixelFilter=true +DeadPixelFilter=false +HotDeadPixelThresh=40 diff --git a/rtdata/profiles/Pop/Pop 3 Skin.pp3 b/rtdata/profiles/Pop/Pop 3 Skin.pp3 index 286d54b43..11b72d37a 100644 --- a/rtdata/profiles/Pop/Pop 3 Skin.pp3 +++ b/rtdata/profiles/Pop/Pop 3 Skin.pp3 @@ -1,5 +1,5 @@ [Version] -AppVersion=4.1.50 +AppVersion=4.2.1 Version=321 [Exposure] @@ -15,7 +15,7 @@ HighlightComprThreshold=0 ShadowCompr=50 CurveMode=SatAndValueBlending CurveMode2=Standard -Curve=3;0;0;0.084;0;0.187;0.188;0.442;0.576;1;1; +Curve=3;0;0;0.084;0;0.187;0.188;0.442;0.58;1;1; Curve2=0; [HLRecovery] @@ -29,27 +29,6 @@ Blue=0;0;100; [Black & White] Enabled=false -Method=Desaturation -Auto=false -ComplementaryColors=true -Setting=NormalContrast -Filter=None -MixerRed=43 -MixerOrange=33 -MixerYellow=33 -MixerGreen=33 -MixerCyan=33 -MixerBlue=30 -MixerMagenta=33 -MixerPurple=33 -GammaRed=0 -GammaGreen=0 -GammaBlue=0 -LuminanceCurve=0; -BeforeCurveMode=Standard -AfterCurveMode=Standard -BeforeCurve=0; -AfterCurve=0; [Luminance Curve] Brightness=0 @@ -70,13 +49,10 @@ ClCurve=0; [Vibrance] Enabled=false -Pastels=50 -Saturated=50 -PSThreshold=0;75; -ProtectSkins=false -AvoidColorShift=false -PastSatTog=true -SkinTonesCurve=0; + +[White Balance] +Setting=Camera +Equal=1 [Color appearance] Enabled=true @@ -95,8 +71,8 @@ M-Chroma=0 J-Contrast=0 Q-Contrast=20 H-Hue=0 -RSTProtection=55 -AdaptScene=6050 +RSTProtection=50 +AdaptScene=208 AutoAdapscen=true SurrSource=false Gamut=true @@ -113,26 +89,14 @@ Curve3=3;0;0;0.08;0.02;0.38;0.73;1;1; Enabled=true Strength=0.25 EdgeStopping=2.4 -Scale=0.1 +Scale=0.10 ReweightingIterates=0 [Shadows & Highlights] Enabled=false -HighQuality=false -Highlights=20 -HighlightTonalWidth=80 -Shadows=20 -ShadowTonalWidth=80 -LocalContrast=0 -Radius=70 [Gradient] Enabled=false -Degree=0 -Feather=25 -Strength=0.6 -CenterX=0 -CenterY=0 [PCVignette] Enabled=true @@ -150,11 +114,15 @@ Enabled=false [RGB Curves] LumaMode=false +rCurve=0; +gCurve=0; +bCurve=0; [ColorToning] Enabled=false [RAW] CA=true -HotDeadPixels=true -HotDeadPixelThresh=40 \ No newline at end of file +HotPixelFilter=true +DeadPixelFilter=false +HotDeadPixelThresh=40 diff --git a/rtdata/profiles/Pop/Pop 4 BW.pp3 b/rtdata/profiles/Pop/Pop 4 BW.pp3 index d881fe822..88302d8d9 100644 --- a/rtdata/profiles/Pop/Pop 4 BW.pp3 +++ b/rtdata/profiles/Pop/Pop 4 BW.pp3 @@ -1,5 +1,5 @@ [Version] -AppVersion=4.1.50 +AppVersion=4.2.1 Version=321 [Exposure] @@ -30,7 +30,7 @@ Blue=0;0;100; [Black & White] Enabled=true Method=ChannelMixer -Auto=false +Auto=true ComplementaryColors=true Setting=RGB-Rel Filter=None @@ -45,6 +45,7 @@ MixerPurple=33 GammaRed=0 GammaGreen=0 GammaBlue=0 +Algorithm=SP LuminanceCurve=0; BeforeCurveMode=Standard AfterCurveMode=Standard @@ -70,17 +71,14 @@ ClCurve=0; [Vibrance] Enabled=false -Pastels=50 -Saturated=50 -PSThreshold=0;75; -ProtectSkins=false -AvoidColorShift=false -PastSatTog=true -SkinTonesCurve=0; + +[White Balance] +Setting=Camera +Equal=1 [Color appearance] Enabled=true -Degree=97 +Degree=100 AutoDegree=true Surround=Average AdaptLum=16 @@ -96,7 +94,7 @@ J-Contrast=0 Q-Contrast=0 H-Hue=0 RSTProtection=0 -AdaptScene=164.329 +AdaptScene=208 AutoAdapscen=true SurrSource=false Gamut=true @@ -113,26 +111,14 @@ Curve3=0; Enabled=true Strength=0.25 EdgeStopping=2.4 -Scale=0.1 +Scale=0.10 ReweightingIterates=0 [Shadows & Highlights] Enabled=false -HighQuality=false -Highlights=20 -HighlightTonalWidth=80 -Shadows=20 -ShadowTonalWidth=80 -LocalContrast=0 -Radius=70 [Gradient] Enabled=false -Degree=0 -Feather=25 -Strength=0.6 -CenterX=0 -CenterY=0 [PCVignette] Enabled=true @@ -150,11 +136,15 @@ Enabled=false [RGB Curves] LumaMode=false +rCurve=0; +gCurve=0; +bCurve=0; [ColorToning] Enabled=false [RAW] CA=true -HotDeadPixels=true -HotDeadPixelThresh=40 \ No newline at end of file +HotPixelFilter=true +DeadPixelFilter=false +HotDeadPixelThresh=40 diff --git a/rtdata/profiles/Portrait/Portrait Lejto.pp3 b/rtdata/profiles/Portrait/Portrait Lejto.pp3 index 92d7a0a89..3e7f4d37f 100644 --- a/rtdata/profiles/Portrait/Portrait Lejto.pp3 +++ b/rtdata/profiles/Portrait/Portrait Lejto.pp3 @@ -1,5 +1,5 @@ [Version] -AppVersion=4.1.50 +AppVersion=4.2.1 Version=321 [Exposure] diff --git a/rtdata/profiles/Portrait/Portrait Smooth.pp3 b/rtdata/profiles/Portrait/Portrait Smooth.pp3 index 6de19439e..a139aeaa1 100644 --- a/rtdata/profiles/Portrait/Portrait Smooth.pp3 +++ b/rtdata/profiles/Portrait/Portrait Smooth.pp3 @@ -1,5 +1,5 @@ [Version] -AppVersion=4.1.50 +AppVersion=4.2.1 Version=321 [Exposure] @@ -29,36 +29,15 @@ Blue=0;0;100; [Black & White] Enabled=false -Method=Desaturation -Auto=false -ComplementaryColors=true -Setting=NormalContrast -Filter=None -MixerRed=33 -MixerOrange=33 -MixerYellow=33 -MixerGreen=33 -MixerCyan=33 -MixerBlue=33 -MixerMagenta=33 -MixerPurple=33 -GammaRed=0 -GammaGreen=0 -GammaBlue=0 -LuminanceCurve=0; -BeforeCurveMode=Standard -AfterCurveMode=Standard -BeforeCurve=0; -AfterCurve=0; [Luminance Curve] Brightness=-20 Contrast=-20 Chromaticity=0 -AvoidColorShift=false +AvoidColorShift=true RedAndSkinTonesProtection=50 LCredsk=true -LCurve=3;0;0;0.0427;0.014;0.162;0.162;0.547;0.933;1;1; +LCurve=3;0;0;0.043;0.014;0.162;0.162;0.652;0.93;1;1; aCurve=0; bCurve=0; ccCurve=1;0;0;0.254;0.3;1;1; @@ -68,92 +47,90 @@ hhCurve=0; LcCurve=0; ClCurve=0; +[Sharpening] +Enabled=true +Method=usm +Radius=0.5 +Amount=250 +Threshold=20;80;2000;1200; +OnlyEdges=false +EdgedetectionRadius=1.9 +EdgeTolerance=1800 +HalocontrolEnabled=false +HalocontrolAmount=85 +DeconvRadius=0.75 +DeconvAmount=75 +DeconvDamping=20 +DeconvIterations=30 + [Vibrance] Enabled=false -Pastels=0 -Saturated=0 -PSThreshold=75;75; -ProtectSkins=false -AvoidColorShift=false -PastSatTog=true -SkinTonesCurve=0; + +[SharpenEdge] +Enabled=false + +[SharpenMicro] +Enabled=false + +[White Balance] +Setting=Camera [Color appearance] Enabled=false -Degree=100 -AutoDegree=true -Surround=Average -AdaptLum=16 -Badpixsl=0 -Model=RawT -Algorithm=JC -J-Light=0 -Q-Bright=0 -C-Chroma=0 -S-Chroma=0 -M-Chroma=0 -J-Contrast=0 -Q-Contrast=0 -H-Hue=0 -RSTProtection=0 -AdaptScene=2000 -AutoAdapscen=true -SurrSource=false -Gamut=true -Datacie=false -Tonecie=false -CurveMode=Lightness -CurveMode2=Lightness -CurveMode3=Chroma -Curve=0; -Curve2=0; -Curve3=0; + +[Impulse Denoising] +Enabled=false + +[Defringing] +Enabled=false + +[Directional Pyramid Denoising] +Enabled=false [EPD] Enabled=false -Strength=0.3 -EdgeStopping=1.4 -Scale=1 -ReweightingIterates=0 [Shadows & Highlights] Enabled=false -HighQuality=false -Highlights=10 -HighlightTonalWidth=80 -Shadows=10 -ShadowTonalWidth=80 -LocalContrast=0 -Radius=70 + +[Crop] +Enabled=false [Gradient] Enabled=false -Degree=0 -Feather=25 -Strength=0.6 -CenterX=0 -CenterY=0 [PCVignette] Enabled=false -Strength=0.6 -Feather=50 -Roundness=50 + +[Directional Pyramid Equalizer] +Enabled=true +Gamutlab=true +Mult0=1 +Mult1=1 +Mult2=1 +Mult3=0.6 +Mult4=0.6 +Threshold=0.2 +Skinprotect=0 +Hueskin=-5;25;170;120; [HSV Equalizer] -HCurve=1;0;0.5;0.35;0.35;0.164;0.49;0.35;0.35;0.333;0.5;0.35;0.35;0.5;0.5;0.35;0.35;0.666;0.5;0.35;0.35;0.833;0.5;0.35;0.35; +HCurve=0; SCurve=0; -VCurve=1;0;0.5;0.35;0.35;0.166;0.5;0.35;0.35;0.333;0.5;0.35;0.35;0.5;0.5;0.35;0.35;0.666;0.5;0.35;0.35;0.833;0.5;0.35;0.35; +VCurve=0; [Film Simulation] Enabled=false [RGB Curves] LumaMode=false -rCurve=1;0;0;0.25;0.25;0.5;0.5;0.75;0.75;1;1; -gCurve=1;0;0;0.25;0.25;0.5;0.5;0.75;0.75;1;1; -bCurve=1;0;0;0.25;0.25;0.5;0.5;0.75;0.75;1;1; +rCurve=0; +gCurve=0; +bCurve=0; [ColorToning] Enabled=false +[RAW] +CA=true + diff --git a/rtdata/profiles/Skintones/Skintones - Natural TM.pp3 b/rtdata/profiles/Skintones/Skintones - Natural TM.pp3 index ce3eb1b0c..8d4875a6c 100644 --- a/rtdata/profiles/Skintones/Skintones - Natural TM.pp3 +++ b/rtdata/profiles/Skintones/Skintones - Natural TM.pp3 @@ -1,5 +1,5 @@ [Version] -AppVersion=4.1.50 +AppVersion=4.2.1 Version=321 [Exposure] diff --git a/rtdata/profiles/Skintones/Skintones - Natural.pp3 b/rtdata/profiles/Skintones/Skintones - Natural.pp3 index 415b5d189..022817a2f 100644 --- a/rtdata/profiles/Skintones/Skintones - Natural.pp3 +++ b/rtdata/profiles/Skintones/Skintones - Natural.pp3 @@ -1,5 +1,5 @@ [Version] -AppVersion=4.1.50 +AppVersion=4.2.1 Version=321 [Exposure] diff --git a/rtdata/profiles/Skintones/Skintones - Pale TM Bright.pp3 b/rtdata/profiles/Skintones/Skintones - Pale TM Bright.pp3 index 879d2f933..e2aee254d 100644 --- a/rtdata/profiles/Skintones/Skintones - Pale TM Bright.pp3 +++ b/rtdata/profiles/Skintones/Skintones - Pale TM Bright.pp3 @@ -1,5 +1,5 @@ [Version] -AppVersion=4.1.50 +AppVersion=4.2.1 Version=321 [Exposure] diff --git a/rtdata/profiles/Skintones/Skintones - Pale TM.pp3 b/rtdata/profiles/Skintones/Skintones - Pale TM.pp3 index d022f261b..0d1150458 100644 --- a/rtdata/profiles/Skintones/Skintones - Pale TM.pp3 +++ b/rtdata/profiles/Skintones/Skintones - Pale TM.pp3 @@ -1,5 +1,5 @@ [Version] -AppVersion=4.1.50 +AppVersion=4.2.1 Version=321 [Exposure] diff --git a/rtdata/profiles/Skintones/Skintones - Pale.pp3 b/rtdata/profiles/Skintones/Skintones - Pale.pp3 index 88675ff03..d28d5982e 100644 --- a/rtdata/profiles/Skintones/Skintones - Pale.pp3 +++ b/rtdata/profiles/Skintones/Skintones - Pale.pp3 @@ -1,5 +1,5 @@ [Version] -AppVersion=4.1.50 +AppVersion=4.2.1 Version=321 [Exposure] diff --git a/rtdata/profiles/Skintones/Skintones - Soft Texture.pp3 b/rtdata/profiles/Skintones/Skintones - Soft Texture.pp3 index d2b66d55e..aa5d51890 100644 --- a/rtdata/profiles/Skintones/Skintones - Soft Texture.pp3 +++ b/rtdata/profiles/Skintones/Skintones - Soft Texture.pp3 @@ -1,5 +1,5 @@ [Version] -AppVersion=4.1.50 +AppVersion=4.2.1 Version=321 [Exposure] diff --git a/rtdata/profiles/Skintones/Skintones - Strong Texture.pp3 b/rtdata/profiles/Skintones/Skintones - Strong Texture.pp3 index 546aad561..026d06e19 100644 --- a/rtdata/profiles/Skintones/Skintones - Strong Texture.pp3 +++ b/rtdata/profiles/Skintones/Skintones - Strong Texture.pp3 @@ -1,5 +1,5 @@ [Version] -AppVersion=4.1.50 +AppVersion=4.2.1 Version=321 [Exposure] diff --git a/rtdata/profiles/Skintones/Skintones - Studio TM.pp3 b/rtdata/profiles/Skintones/Skintones - Studio TM.pp3 index c1ff332b1..c32643839 100644 --- a/rtdata/profiles/Skintones/Skintones - Studio TM.pp3 +++ b/rtdata/profiles/Skintones/Skintones - Studio TM.pp3 @@ -1,5 +1,5 @@ [Version] -AppVersion=4.1.50 +AppVersion=4.2.1 Version=321 [Exposure] diff --git a/rtdata/profiles/Skintones/Skintones - Studio.pp3 b/rtdata/profiles/Skintones/Skintones - Studio.pp3 index 1a5167efa..814d63480 100644 --- a/rtdata/profiles/Skintones/Skintones - Studio.pp3 +++ b/rtdata/profiles/Skintones/Skintones - Studio.pp3 @@ -1,5 +1,5 @@ [Version] -AppVersion=4.1.50 +AppVersion=4.2.1 Version=321 [Exposure] diff --git a/rtdata/profiles/Skintones/Skintones - StudioBase 1 TM.pp3 b/rtdata/profiles/Skintones/Skintones - StudioBase 1 TM.pp3 index cee28958f..1c1b62153 100644 --- a/rtdata/profiles/Skintones/Skintones - StudioBase 1 TM.pp3 +++ b/rtdata/profiles/Skintones/Skintones - StudioBase 1 TM.pp3 @@ -1,5 +1,5 @@ [Version] -AppVersion=4.1.50 +AppVersion=4.2.1 Version=321 [Exposure] diff --git a/rtdata/profiles/Skintones/Skintones - StudioBase 1.pp3 b/rtdata/profiles/Skintones/Skintones - StudioBase 1.pp3 index 27429b629..85a2c1da2 100644 --- a/rtdata/profiles/Skintones/Skintones - StudioBase 1.pp3 +++ b/rtdata/profiles/Skintones/Skintones - StudioBase 1.pp3 @@ -1,5 +1,5 @@ [Version] -AppVersion=4.1.50 +AppVersion=4.2.1 Version=321 [Exposure] diff --git a/rtgui/main.cc b/rtgui/main.cc index 1ffa5c1b8..f268139f8 100644 --- a/rtgui/main.cc +++ b/rtgui/main.cc @@ -321,7 +321,7 @@ int processLineParams( int argc, char **argv ) bool skipIfNoSidecar=false; bool useDefault=false; unsigned int sideCarFilePos = 0; - int compression=100; + int compression=92; int subsampling=3; int bits=-1; std::string outputType = ""; @@ -481,7 +481,7 @@ int processLineParams( int argc, char **argv ) std::cout << " -d Use the default raw or non-raw " << pparamsExt << " file as set in" << std::endl; std::cout << " Preferences > Image Processing > Default Processing Profile" << std::endl; std::cout << " -j[1-100] Specify output to be JPEG (on by default). Optionally add" << std::endl; - std::cout << " compression 1-100 (default value: 100)." << std::endl; + std::cout << " compression 1-100 (default value: 92)." << std::endl; std::cout << " -js<1-3> Specify the JPEG subsampling parameter, where:" << std::endl; std::cout << " 1 = Best compression: 2x2, 1x1, 1x1 (4:1:1) - default of the JPEG library" << std::endl; std::cout << " 2 = Widely used normal ratio: 2x1, 1x1, 1x1 (4:2:2)" << std::endl; diff --git a/rtgui/options.cc b/rtgui/options.cc index 828cfafac..8a4b843d1 100644 --- a/rtgui/options.cc +++ b/rtgui/options.cc @@ -236,16 +236,16 @@ void Options::setDefaults () { saveAsDialogHeight = 680; savesParamsAtExit = true; saveFormat.format = "jpg"; - saveFormat.jpegQuality = 90; + saveFormat.jpegQuality = 92; saveFormat.jpegSubSamp = 2; saveFormat.pngCompression = 6; saveFormat.pngBits = 8; - saveFormat.tiffBits = 8; + saveFormat.tiffBits = 16; saveFormat.tiffUncompressed = true; saveFormat.saveParams = true; saveFormatBatch.format = "jpg"; - saveFormatBatch.jpegQuality = 90; + saveFormatBatch.jpegQuality = 92; saveFormatBatch.jpegSubSamp = 2; saveFormatBatch.pngCompression = 6; saveFormatBatch.pngBits = 8; @@ -269,8 +269,8 @@ void Options::setDefaults () { dirBrowserHeight = 350; preferencesWidth = 800; preferencesHeight = 0; - toolPanelWidth = 390; - browserToolPanelWidth = 430; + toolPanelWidth = 400; + browserToolPanelWidth = 465; browserToolPanelHeight = 600; browserToolPanelOpened = true;; browserDirPanelOpened = true;