diff --git a/rtdata/profiles/Auto-Matched Curve - ISO High.pp3 b/rtdata/profiles/Auto-Matched Curve - ISO High.pp3 new file mode 100644 index 000000000..642b3b362 --- /dev/null +++ b/rtdata/profiles/Auto-Matched Curve - ISO High.pp3 @@ -0,0 +1,64 @@ +[Version] +AppVersion=5.3-524-g4046a3c9 +Version=330 + +[Exposure] +Auto=false +Clip=0.02 +Compensation=0 +Brightness=0 +Contrast=0 +Saturation=0 +Black=0 +HighlightCompr=0 +HighlightComprThreshold=33 +ShadowCompr=50 +HistogramMatching=true +CurveMode=FilmLike +CurveMode2=WeightedStd +Curve=1;0;0;1;1; +Curve2=0; + +[HLRecovery] +Enabled=true +Method=Blend + +[Directional Pyramid Denoising] +Enabled=true +Enhance=false +Median=true +Luma=50 +Ldetail=60 +Method=Lab +LMethod=SLI +CMethod=AUT +C2Method=AUTO +SMethod=shal +MedMethod=55 +RGBMethod=soft +MethodMed=Lpab +Redchro=0 +Bluechro=0 +Gamma=1.7 +Passes=1 +LCurve=0 +CCCurve=0 + +[RAW] +CA=true + +[RAW Bayer] +Method=lmmse +CcSteps=2 +LMMSEIterations=2 + +[RAW X-Trans] +Method=3-pass (best) +CcSteps=0 + +[Color Management] +ToneCurve=false +ApplyLookTable=true +ApplyBaselineExposureOffset=true +ApplyHueSatMap=true +DCPIlluminant=0 diff --git a/rtdata/profiles/Auto-Matched Curve - ISO Low.pp3 b/rtdata/profiles/Auto-Matched Curve - ISO Low.pp3 new file mode 100644 index 000000000..bdd0c7294 --- /dev/null +++ b/rtdata/profiles/Auto-Matched Curve - ISO Low.pp3 @@ -0,0 +1,34 @@ +[Version] +AppVersion=5.3-524-g4046a3c9 +Version=330 + +[Exposure] +Auto=false +Clip=0.02 +Compensation=0 +Brightness=0 +Contrast=0 +Saturation=0 +Black=0 +HighlightCompr=0 +HighlightComprThreshold=33 +ShadowCompr=50 +HistogramMatching=true +CurveMode=FilmLike +CurveMode2=WeightedStd +Curve=0; +Curve2=0; + +[HLRecovery] +Enabled=true +Method=Blend + +[RAW] +CA=true + +[Color Management] +ToneCurve=false +ApplyLookTable=true +ApplyBaselineExposureOffset=true +ApplyHueSatMap=true +DCPIlluminant=0 diff --git a/rtdata/profiles/Auto-Matched Curve - ISO Medium.pp3 b/rtdata/profiles/Auto-Matched Curve - ISO Medium.pp3 new file mode 100644 index 000000000..cb3a09986 --- /dev/null +++ b/rtdata/profiles/Auto-Matched Curve - ISO Medium.pp3 @@ -0,0 +1,56 @@ +[Version] +AppVersion=5.3-524-g4046a3c9 +Version=330 + +[Exposure] +Auto=false +Clip=0.02 +Compensation=0 +Brightness=0 +Contrast=0 +Saturation=0 +Black=0 +HighlightCompr=0 +HighlightComprThreshold=33 +ShadowCompr=50 +HistogramMatching=true +CurveMode=FilmLike +CurveMode2=WeightedStd +Curve=0; +Curve2=0; + +[HLRecovery] +Enabled=true +Method=Blend + +[Directional Pyramid Denoising] +Enabled=true +Enhance=false +Median=false +Luma=0 +Ldetail=0 +Chroma=0 +Method=Lab +LMethod=SLI +CMethod=AUT +C2Method=AUTO +SMethod=shal +MedMethod=55 +RGBMethod=soft +MethodMed=Lpab +Redchro=0 +Bluechro=0 +Gamma=1.7 +Passes=1 +LCurve=0 +CCCurve=0 + +[RAW] +CA=true + +[Color Management] +ToneCurve=false +ApplyLookTable=true +ApplyBaselineExposureOffset=true +ApplyHueSatMap=true +DCPIlluminant=0 diff --git a/rtdata/profiles/Default ISO High.pp3 b/rtdata/profiles/Default ISO High.pp3 deleted file mode 100644 index c15085093..000000000 --- a/rtdata/profiles/Default ISO High.pp3 +++ /dev/null @@ -1,171 +0,0 @@ -[Version] -AppVersion=5.1 -Version=326 - -[Exposure] -Auto=true -Clip=0.02 -Saturation=0 -CurveMode=Perceptual -CurveMode2=Perceptual -Curve=0; -Curve2=0; - -[Retinex] -Enabled=false - -[Channel Mixer] -Red=100;0;0; -Green=0;100;0; -Blue=0;0;100; - -[Black & White] -Enabled=false - -[Luminance Curve] -Brightness=0 -Contrast=0 -Chromaticity=0 -AvoidColorShift=false -RedAndSkinTonesProtection=0 -LCredsk=true -LCurve=0; -aCurve=0; -bCurve=0; -ccCurve=0; -chCurve=0; -lhCurve=0; -hhCurve=0; -LcCurve=0; -ClCurve=0; - -[Sharpening] -Enabled=false - -[Vibrance] -Enabled=false - -[SharpenEdge] -Enabled=false - -[SharpenMicro] -Enabled=false - -[White Balance] -Setting=Camera -Equal=1 -TemperatureBias=0 - -[Color appearance] -Enabled=false - -[Impulse Denoising] -Enabled=false - -[Defringing] -Enabled=false - -[Directional Pyramid Denoising] -Enabled=true -Enhance=false -Median=true -Auto=false -Luma=40 -Ldetail=80 -Method=Lab -LMethod=SLI -CMethod=MAN -C2Method=AUTO -SMethod=shal -MedMethod=soft -RGBMethod=soft -MethodMed=Lpab -Gamma=1.7 -Passes=1 - -[EPD] -Enabled=false - -[Shadows & Highlights] -Enabled=false - -[Gradient] -Enabled=false - -[PCVignette] -Enabled=false - -[Color Management] -InputProfile=(cameraICC) -ToneCurve=false -ApplyLookTable=false -ApplyBaselineExposureOffset=true -ApplyHueSatMap=true -BlendCMSMatrix=false -DCPIlluminant=0 -WorkingProfile=ProPhoto -OutputProfile=RT_sRGB -OutputProfileIntent=Relative -OutputBPC=true -Gammafree=default -Freegamma=false -GammaValue=2.2200000000000002 -GammaSlope=4.5 - -[Wavelet] -Enabled=false - -[Directional Pyramid Equalizer] -Enabled=false - -[HSV Equalizer] -HCurve=0; -SCurve=0; -VCurve=0; - -[Film Simulation] -Enabled=false - -[RGB Curves] -LumaMode=false -rCurve=0; -gCurve=0; -bCurve=0; - -[ColorToning] -Enabled=false - -[RAW] -DarkFrame=/szeva -DarkFrameAuto=false -FlatFieldFile=/szeva -FlatFieldAutoSelect=false -CA=true -HotPixelFilter=false -DeadPixelFilter=false -HotDeadPixelThresh=100 -PreExposure=1 -PrePreserv=0 - -[RAW Bayer] -Method=lmmse -ImageNum=1 -CcSteps=0 -PreBlack0=0 -PreBlack1=0 -PreBlack2=0 -PreBlack3=0 -PreTwoGreen=true -LineDenoise=0 -GreenEqThreshold=0 -DCBIterations=2 -DCBEnhance=true -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 deleted file mode 100644 index 0bd94097f..000000000 --- a/rtdata/profiles/Default ISO Medium.pp3 +++ /dev/null @@ -1,184 +0,0 @@ -[Version] -AppVersion=5.1 -Version=326 - -[Exposure] -Auto=true -Clip=0.02 -Saturation=0 -CurveMode=Perceptual -CurveMode2=Perceptual -Curve=0; -Curve2=0; - -[Retinex] -Enabled=false - -[Channel Mixer] -Red=100;0;0; -Green=0;100;0; -Blue=0;0;100; - -[Black & White] -Enabled=false - -[Luminance Curve] -Brightness=0 -Contrast=0 -Chromaticity=0 -AvoidColorShift=false -RedAndSkinTonesProtection=0 -LCredsk=true -LCurve=0; -aCurve=0; -bCurve=0; -ccCurve=0; -chCurve=0; -lhCurve=0; -hhCurve=0; -LcCurve=0; -ClCurve=0; - -[Sharpening] -Enabled=true -Method=usm -Radius=0.75 -Amount=200 -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 - -[SharpenEdge] -Enabled=false - -[SharpenMicro] -Enabled=false - -[White Balance] -Setting=Camera -Equal=1 -TemperatureBias=0 - -[Color appearance] -Enabled=false - -[Impulse Denoising] -Enabled=false - -[Defringing] -Enabled=false - -[Directional Pyramid Denoising] -Enabled=true -Enhance=false -Median=false -Auto=false -Luma=0 -Ldetail=80 -Method=Lab -LMethod=SLI -CMethod=MAN -C2Method=AUTO -SMethod=shal -MedMethod=soft -RGBMethod=soft -MethodMed=Lonly -Gamma=1.7 -Passes=1 - -[EPD] -Enabled=false - -[Shadows & Highlights] -Enabled=false - -[Gradient] -Enabled=false - -[PCVignette] -Enabled=false - -[Color Management] -InputProfile=(cameraICC) -ToneCurve=false -ApplyLookTable=false -ApplyBaselineExposureOffset=true -ApplyHueSatMap=true -BlendCMSMatrix=false -DCPIlluminant=0 -WorkingProfile=ProPhoto -OutputProfile=RT_sRGB -OutputProfileIntent=Relative -OutputBPC=true -Gammafree=default -Freegamma=false -GammaValue=2.2200000000000002 -GammaSlope=4.5 - -[Wavelet] -Enabled=false - -[Directional Pyramid Equalizer] -Enabled=false - -[HSV Equalizer] -HCurve=0; -SCurve=0; -VCurve=0; - -[Film Simulation] -Enabled=false - -[RGB Curves] -LumaMode=false -rCurve=0; -gCurve=0; -bCurve=0; - -[ColorToning] -Enabled=false - -[RAW] -DarkFrame=/szeva -DarkFrameAuto=false -FlatFieldFile=/szeva -FlatFieldAutoSelect=false -CA=true -HotPixelFilter=false -DeadPixelFilter=false -HotDeadPixelThresh=100 -PreExposure=1 -PrePreserv=0 - -[RAW Bayer] -Method=amaze -ImageNum=1 -CcSteps=0 -PreBlack0=0 -PreBlack1=0 -PreBlack2=0 -PreBlack3=0 -PreTwoGreen=true -LineDenoise=0 -GreenEqThreshold=0 -DCBIterations=2 -DCBEnhance=true -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 deleted file mode 100644 index 227ee2e6b..000000000 --- a/rtdata/profiles/Default.pp3 +++ /dev/null @@ -1,169 +0,0 @@ -[Version] -AppVersion=5.1 -Version=326 - -[Exposure] -Auto=true -Clip=0.02 -Saturation=0 -CurveMode=Perceptual -CurveMode2=Perceptual -Curve=0; -Curve2=0; - -[Retinex] -Enabled=false - -[Channel Mixer] -Red=100;0;0; -Green=0;100;0; -Blue=0;0;100; - -[Black & White] -Enabled=false - -[Luminance Curve] -Brightness=0 -Contrast=0 -Chromaticity=0 -AvoidColorShift=false -RedAndSkinTonesProtection=0 -LCredsk=true -LCurve=0; -aCurve=0; -bCurve=0; -ccCurve=0; -chCurve=0; -lhCurve=0; -hhCurve=0; -LcCurve=0; -ClCurve=0; - -[Sharpening] -Enabled=true -Method=usm -Radius=0.5 -Amount=200 -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 - -[SharpenEdge] -Enabled=false - -[SharpenMicro] -Enabled=false - -[White Balance] -Setting=Camera -Equal=1 -TemperatureBias=0 - -[Color appearance] -Enabled=false - -[Impulse Denoising] -Enabled=false - -[Defringing] -Enabled=false - -[Directional Pyramid Denoising] -Enabled=false - -[EPD] -Enabled=false - -[Shadows & Highlights] -Enabled=false - -[Gradient] -Enabled=false - -[PCVignette] -Enabled=false - -[Color Management] -InputProfile=(cameraICC) -ToneCurve=false -ApplyLookTable=false -ApplyBaselineExposureOffset=true -ApplyHueSatMap=true -BlendCMSMatrix=false -DCPIlluminant=0 -WorkingProfile=ProPhoto -OutputProfile=RT_sRGB -OutputProfileIntent=Relative -OutputBPC=true -Gammafree=default -Freegamma=false -GammaValue=2.2200000000000002 -GammaSlope=4.5 - -[Wavelet] -Enabled=false - -[Directional Pyramid Equalizer] -Enabled=false - -[HSV Equalizer] -HCurve=0; -SCurve=0; -VCurve=0; - -[Film Simulation] -Enabled=false - -[RGB Curves] -LumaMode=false -rCurve=0; -gCurve=0; -bCurve=0; - -[ColorToning] -Enabled=false - -[RAW] -DarkFrame=/szeva -DarkFrameAuto=false -FlatFieldFile=/szeva -FlatFieldAutoSelect=false -CA=true -HotPixelFilter=false -DeadPixelFilter=false -HotDeadPixelThresh=100 -PreExposure=1 -PrePreserv=0 - -[RAW Bayer] -Method=amaze -ImageNum=1 -CcSteps=0 -PreBlack0=0 -PreBlack1=0 -PreBlack2=0 -PreBlack3=0 -PreTwoGreen=true -LineDenoise=0 -GreenEqThreshold=0 -DCBIterations=2 -DCBEnhance=true -LMMSEIterations=2 - -[RAW X-Trans] -Method=3-pass (best) -CcSteps=0 -PreBlackRed=0 -PreBlackGreen=0 -PreBlackBlue=0 - diff --git a/rtdata/profiles/Standard Film Curve - ISO High.pp3 b/rtdata/profiles/Standard Film Curve - ISO High.pp3 new file mode 100644 index 000000000..46f9fd37a --- /dev/null +++ b/rtdata/profiles/Standard Film Curve - ISO High.pp3 @@ -0,0 +1,65 @@ +[Version] +AppVersion=5.3-524-g4046a3c9 +Version=330 + +[Exposure] +Auto=false +Clip=0.02 +Compensation=0 +Brightness=0 +Contrast=0 +Saturation=0 +Black=0 +HighlightCompr=90 +HighlightComprThreshold=33 +ShadowCompr=50 +HistogramMatching=false +CurveMode=FilmLike +CurveMode2=WeightedStd +Curve=1;0;0;0.11;0.09;0.32;0.43;0.66;0.87;1;1; +Curve2=0; + +[HLRecovery] +Enabled=true +Method=Blend + +[Directional Pyramid Denoising] +Enabled=true +Enhance=false +Median=true +Luma=50 +Ldetail=60 +Chroma=0 +Method=Lab +LMethod=SLI +CMethod=AUT +C2Method=AUTO +SMethod=shal +MedMethod=55 +RGBMethod=soft +MethodMed=Lpab +Redchro=0 +Bluechro=0 +Gamma=1.7 +Passes=1 +LCurve=0 +CCCurve=0 + +[RAW] +CA=true + +[RAW Bayer] +Method=lmmse +CcSteps=2 +LMMSEIterations=2 + +[RAW X-Trans] +Method=3-pass (best) +CcSteps=0 + +[Color Management] +ToneCurve=false +ApplyLookTable=true +ApplyBaselineExposureOffset=true +ApplyHueSatMap=true +DCPIlluminant=0 diff --git a/rtdata/profiles/Standard Film Curve - ISO Low.pp3 b/rtdata/profiles/Standard Film Curve - ISO Low.pp3 new file mode 100644 index 000000000..f2b8ca35f --- /dev/null +++ b/rtdata/profiles/Standard Film Curve - ISO Low.pp3 @@ -0,0 +1,34 @@ +[Version] +AppVersion=5.3-524-g4046a3c9 +Version=330 + +[Exposure] +Auto=false +Clip=0.02 +Compensation=0 +Brightness=0 +Contrast=0 +Saturation=0 +Black=0 +HighlightCompr=90 +HighlightComprThreshold=33 +ShadowCompr=50 +HistogramMatching=false +CurveMode=FilmLike +CurveMode2=WeightedStd +Curve=1;0;0;0.11;0.09;0.32;0.43;0.66;0.87;1;1; +Curve2=0; + +[HLRecovery] +Enabled=true +Method=Blend + +[RAW] +CA=true + +[Color Management] +ToneCurve=false +ApplyLookTable=true +ApplyBaselineExposureOffset=true +ApplyHueSatMap=true +DCPIlluminant=0 diff --git a/rtdata/profiles/Standard Film Curve - ISO Medium.pp3 b/rtdata/profiles/Standard Film Curve - ISO Medium.pp3 new file mode 100644 index 000000000..dff0d42b5 --- /dev/null +++ b/rtdata/profiles/Standard Film Curve - ISO Medium.pp3 @@ -0,0 +1,56 @@ +[Version] +AppVersion=5.3-524-g4046a3c9 +Version=330 + +[Exposure] +Auto=false +Clip=0.02 +Compensation=0 +Brightness=0 +Contrast=0 +Saturation=0 +Black=0 +HighlightCompr=90 +HighlightComprThreshold=33 +ShadowCompr=50 +HistogramMatching=false +CurveMode=FilmLike +CurveMode2=WeightedStd +Curve=1;0;0;0.11;0.09;0.32;0.43;0.66;0.87;1;1; +Curve2=0; + +[HLRecovery] +Enabled=true +Method=Blend + +[Directional Pyramid Denoising] +Enabled=true +Enhance=false +Median=false +Luma=0 +Ldetail=0 +Chroma=0 +Method=Lab +LMethod=SLI +CMethod=AUT +C2Method=AUTO +SMethod=shal +MedMethod=soft +RGBMethod=soft +MethodMed=Lonly +Redchro=0 +Bluechro=0 +Gamma=1.7 +Passes=1 +LCurve=0 +CCCurve=0 + +[RAW] +CA=true + +[Color Management] +ToneCurve=false +ApplyLookTable=true +ApplyBaselineExposureOffset=true +ApplyHueSatMap=true +DCPIlluminant=0 diff --git a/rtgui/options.cc b/rtgui/options.cc index 90b7378a6..0d227b6eb 100644 --- a/rtgui/options.cc +++ b/rtgui/options.cc @@ -2198,11 +2198,11 @@ void Options::load (bool lightweight) if (!tmpFName.empty()) { if (options.rtSettings.verbose) { - printf ("Raws' default profile \"%s\" found\n", options.defProfRaw.c_str()); + printf ("Default profile for raw images \"%s\" found\n", options.defProfRaw.c_str()); } } else { if (options.rtSettings.verbose) { - printf ("Raws' default profile \"%s\" not found or not set -> using Internal values\n", options.defProfRaw.c_str()); + printf ("Default profile for raw images \"%s\" not found or not set -> using Internal values\n", options.defProfRaw.c_str()); } options.defProfRaw = DEFPROFILE_INTERNAL; @@ -2217,11 +2217,11 @@ void Options::load (bool lightweight) if (!tmpFName.empty()) { if (options.rtSettings.verbose) { - printf ("Images' default profile \"%s\" found\n", options.defProfImg.c_str()); + printf ("Default profile for non-raw images \"%s\" found\n", options.defProfImg.c_str()); } } else { if (options.rtSettings.verbose) { - printf ("Images' default profile \"%s\" not found or not set -> using Internal values\n", options.defProfImg.c_str()); + printf ("Default profile for non-raw images \"%s\" not found or not set -> using Internal values\n", options.defProfImg.c_str()); } options.defProfImg = DEFPROFILE_INTERNAL; diff --git a/rtgui/options.h b/rtgui/options.h index 31d17ef9b..7a4a23b4d 100644 --- a/rtgui/options.h +++ b/rtgui/options.h @@ -32,9 +32,9 @@ // Default bundled profile name to use for Raw images #ifdef WIN32 -#define DEFPROFILE_RAW "${G}\\Default" +#define DEFPROFILE_RAW "${G}\\Auto-Matched Curve - ISO Low" #else -#define DEFPROFILE_RAW "${G}/Default" +#define DEFPROFILE_RAW "${G}/Auto-Matched Curve - ISO Low" #endif // Default bundled profile name to use for Standard images #define DEFPROFILE_IMG "Neutral"