diff --git a/astylert.bat b/astylert.bat
new file mode 100644
index 000000000..1c918135f
--- /dev/null
+++ b/astylert.bat
@@ -0,0 +1 @@
+astyle --options=rawtherapee.astylerc -n %1
\ No newline at end of file
diff --git a/rawtherapee.appdata.xml b/rawtherapee.appdata.xml
index 72029c913..09225e5dd 100644
--- a/rawtherapee.appdata.xml
+++ b/rawtherapee.appdata.xml
@@ -13,24 +13,6 @@
All aspects of RawTherapee are documented in the RawPedia wiki. There is also an active forum and IRC channel for interaction with the developers and other users.
-
- Supported input formats:
-
-
- - Most raw formats including those from Bayer and X-Trans type sensors
- - HDR DNG 1.4 with floating-point data
- - 8-bit, 16-bit and 32-bit TIFF (RGB)
- - 8-bit and 16-bit PNG (RGB)
- - JPEG
-
-
- Supported output formats:
-
-
- - JPEG
- - 8-bit and 16-bit TIFF
- - 8-bit and 16-bit PNG
-
http://rawtherapee.com/images/screenshots/rt-42_07-hdr-landscape.jpg
diff --git a/rtdata/languages/Catala b/rtdata/languages/Catala
index 7a7d4e400..272446cc4 100644
--- a/rtdata/languages/Catala
+++ b/rtdata/languages/Catala
@@ -679,7 +679,6 @@ SAVEDLG_SUBSAMP;Submostreig
SAVEDLG_SUBSAMP_1;Millor compressió
SAVEDLG_SUBSAMP_2;Equilibrat
SAVEDLG_SUBSAMP_3;Millor qualitat
-SAVEDLG_SUBSAMP_TOOLTIP;Gran compressió: 4:1:1\nEquilibrat: 4:2:2\nMillor qualitat: 4:4:4
SAVEDLG_TIFFUNCOMPRESSED;TIFF no comprimit
SAVEDLG_WARNFILENAME;El fitxer es dirà
SHCSELECTOR_TOOLTIP;Clic al botó dret per a restaurar\nla posició dels 3 nivells.
@@ -1426,6 +1425,7 @@ ZOOMPANEL_ZOOMOUT;Allunya\nDrecera: -
!PROGRESSBAR_NOIMAGES;No images found
!PROGRESSBAR_SNAPSHOT_ADDED;Snapshot added
!SAVEDLG_FORCEFORMATOPTS;Force saving options
+!SAVEDLG_SUBSAMP_TOOLTIP;Best compression:\nJ:a:b 4:2:0\nh/v 2/2\nChroma halved horizontally and vertically.\n\nBalanced:\nJ:a:b 4:2:2\nh/v 2/1\nChroma halved horizontally.\n\nBest quality:\nJ:a:b 4:4:4\nh/v 1/1\nNo chroma subsampling.
!TP_BWMIX_ALGO;Algorithm OYCPM
!TP_BWMIX_ALGO_LI;Linear
!TP_BWMIX_ALGO_SP;Special effects
@@ -1749,9 +1749,9 @@ ZOOMPANEL_ZOOMOUT;Allunya\nDrecera: -
!TP_RETINEX_CURVEEDITOR_CD_TOOLTIP;Luminance according to luminance L=f(L)\nCorrect raw data to reduce halos and artifacts.
!TP_RETINEX_CURVEEDITOR_LH;Strength=f(H)
!TP_RETINEX_CURVEEDITOR_LH_TOOLTIP;Strength according to hue Strength=f(H)\nThis curve also acts on chroma when using the "Highlight" retinex method.
+!TP_RETINEX_FREEGAMMA;Free gamma
!TP_RETINEX_GAIN;Gain
-!TP_RETINEX_GAIN_TOOLTIP;Acts on the transmission in combination with the offset. This is very different from the others settings. Used for black or white pixels, and to help balance the histogram.
-!TP_RETINEX_GAMMA;Free gamma
+!TP_RETINEX_GAIN_TOOLTIP;Acts on the restored image.\n\nThis is very different from the others settings. Used for black or white pixels, and to help balance the histogram.
!TP_RETINEX_GAMMA;Gamma
!TP_RETINEX_GAMMA_FREE;Free
!TP_RETINEX_GAMMA_HIGH;High
@@ -1770,7 +1770,7 @@ ZOOMPANEL_ZOOMOUT;Allunya\nDrecera: -
!TP_RETINEX_LOW;Low
!TP_RETINEX_MEDIAN;Transmission median filter
!TP_RETINEX_METHOD;Method
-!TP_RETINEX_METHOD_TOOLTIP;Low = Reinforce low light,\nUniform = Equalize action,\nHigh = Reinforce high light,\nHighlight = Remove magenta in highlights.
+!TP_RETINEX_METHOD_TOOLTIP;Low = Reinforce low light,\nUniform = Equalize action,\nHigh = Reinforce high light,\nHighlights = Remove magenta in highlights.
!TP_RETINEX_MLABEL;Restored haze-free Min=%1 Max=%2
!TP_RETINEX_MLABEL_TOOLTIP;Should be near min=0 max=32768\nRestored image with no mixture.
!TP_RETINEX_NEIGHBOR;Neighboring pixels
diff --git a/rtdata/languages/Chinese (Simplified) b/rtdata/languages/Chinese (Simplified)
index 38a6e31f8..0833b1a05 100644
--- a/rtdata/languages/Chinese (Simplified)
+++ b/rtdata/languages/Chinese (Simplified)
@@ -1392,7 +1392,7 @@ ZOOMPANEL_ZOOMOUT;缩放拉远\n快捷键: -
!PROGRESSBAR_PROCESSING_PROFILESAVED;Processing profile saved
!PROGRESSBAR_SNAPSHOT_ADDED;Snapshot added
!PROGRESSDLG_PROFILECHANGEDINBROWSER;Processing profile changed in browser
-!SAVEDLG_SUBSAMP_TOOLTIP;Best compression: 4:1:1\nBalanced: 4:2:2\nBest quality: 4:4:4
+!SAVEDLG_SUBSAMP_TOOLTIP;Best compression:\nJ:a:b 4:2:0\nh/v 2/2\nChroma halved horizontally and vertically.\n\nBalanced:\nJ:a:b 4:2:2\nh/v 2/1\nChroma halved horizontally.\n\nBest quality:\nJ:a:b 4:4:4\nh/v 1/1\nNo chroma subsampling.
!SHCSELECTOR_TOOLTIP;Click right mouse button to reset the position of those 3 sliders.
!THRESHOLDSELECTOR_BL;Bottom-left
!THRESHOLDSELECTOR_BR;Bottom-right
@@ -1716,9 +1716,9 @@ ZOOMPANEL_ZOOMOUT;缩放拉远\n快捷键: -
!TP_RETINEX_CURVEEDITOR_CD_TOOLTIP;Luminance according to luminance L=f(L)\nCorrect raw data to reduce halos and artifacts.
!TP_RETINEX_CURVEEDITOR_LH;Strength=f(H)
!TP_RETINEX_CURVEEDITOR_LH_TOOLTIP;Strength according to hue Strength=f(H)\nThis curve also acts on chroma when using the "Highlight" retinex method.
+!TP_RETINEX_FREEGAMMA;Free gamma
!TP_RETINEX_GAIN;Gain
-!TP_RETINEX_GAIN_TOOLTIP;Acts on the transmission in combination with the offset. This is very different from the others settings. Used for black or white pixels, and to help balance the histogram.
-!TP_RETINEX_GAMMA;Free gamma
+!TP_RETINEX_GAIN_TOOLTIP;Acts on the restored image.\n\nThis is very different from the others settings. Used for black or white pixels, and to help balance the histogram.
!TP_RETINEX_GAMMA;Gamma
!TP_RETINEX_GAMMA_FREE;Free
!TP_RETINEX_GAMMA_HIGH;High
@@ -1737,7 +1737,7 @@ ZOOMPANEL_ZOOMOUT;缩放拉远\n快捷键: -
!TP_RETINEX_LOW;Low
!TP_RETINEX_MEDIAN;Transmission median filter
!TP_RETINEX_METHOD;Method
-!TP_RETINEX_METHOD_TOOLTIP;Low = Reinforce low light,\nUniform = Equalize action,\nHigh = Reinforce high light,\nHighlight = Remove magenta in highlights.
+!TP_RETINEX_METHOD_TOOLTIP;Low = Reinforce low light,\nUniform = Equalize action,\nHigh = Reinforce high light,\nHighlights = Remove magenta in highlights.
!TP_RETINEX_MLABEL;Restored haze-free Min=%1 Max=%2
!TP_RETINEX_MLABEL_TOOLTIP;Should be near min=0 max=32768\nRestored image with no mixture.
!TP_RETINEX_NEIGHBOR;Neighboring pixels
diff --git a/rtdata/languages/Chinese (Traditional) b/rtdata/languages/Chinese (Traditional)
index 55433c068..398db0ccf 100644
--- a/rtdata/languages/Chinese (Traditional)
+++ b/rtdata/languages/Chinese (Traditional)
@@ -1213,7 +1213,7 @@ TP_WBALANCE_TEMPERATURE;色溫
!SAVEDLG_SUBSAMP_1;Best compression
!SAVEDLG_SUBSAMP_2;Balanced
!SAVEDLG_SUBSAMP_3;Best quality
-!SAVEDLG_SUBSAMP_TOOLTIP;Best compression: 4:1:1\nBalanced: 4:2:2\nBest quality: 4:4:4
+!SAVEDLG_SUBSAMP_TOOLTIP;Best compression:\nJ:a:b 4:2:0\nh/v 2/2\nChroma halved horizontally and vertically.\n\nBalanced:\nJ:a:b 4:2:2\nh/v 2/1\nChroma halved horizontally.\n\nBest quality:\nJ:a:b 4:4:4\nh/v 1/1\nNo chroma subsampling.
!SAVEDLG_TIFFUNCOMPRESSED;Uncompressed TIFF
!SAVEDLG_WARNFILENAME;File will be named
!SHCSELECTOR_TOOLTIP;Click right mouse button to reset the position of those 3 sliders.
@@ -1683,9 +1683,9 @@ TP_WBALANCE_TEMPERATURE;色溫
!TP_RETINEX_CURVEEDITOR_CD_TOOLTIP;Luminance according to luminance L=f(L)\nCorrect raw data to reduce halos and artifacts.
!TP_RETINEX_CURVEEDITOR_LH;Strength=f(H)
!TP_RETINEX_CURVEEDITOR_LH_TOOLTIP;Strength according to hue Strength=f(H)\nThis curve also acts on chroma when using the "Highlight" retinex method.
+!TP_RETINEX_FREEGAMMA;Free gamma
!TP_RETINEX_GAIN;Gain
-!TP_RETINEX_GAIN_TOOLTIP;Acts on the transmission in combination with the offset. This is very different from the others settings. Used for black or white pixels, and to help balance the histogram.
-!TP_RETINEX_GAMMA;Free gamma
+!TP_RETINEX_GAIN_TOOLTIP;Acts on the restored image.\n\nThis is very different from the others settings. Used for black or white pixels, and to help balance the histogram.
!TP_RETINEX_GAMMA;Gamma
!TP_RETINEX_GAMMA_FREE;Free
!TP_RETINEX_GAMMA_HIGH;High
@@ -1704,7 +1704,7 @@ TP_WBALANCE_TEMPERATURE;色溫
!TP_RETINEX_LOW;Low
!TP_RETINEX_MEDIAN;Transmission median filter
!TP_RETINEX_METHOD;Method
-!TP_RETINEX_METHOD_TOOLTIP;Low = Reinforce low light,\nUniform = Equalize action,\nHigh = Reinforce high light,\nHighlight = Remove magenta in highlights.
+!TP_RETINEX_METHOD_TOOLTIP;Low = Reinforce low light,\nUniform = Equalize action,\nHigh = Reinforce high light,\nHighlights = Remove magenta in highlights.
!TP_RETINEX_MLABEL;Restored haze-free Min=%1 Max=%2
!TP_RETINEX_MLABEL_TOOLTIP;Should be near min=0 max=32768\nRestored image with no mixture.
!TP_RETINEX_NEIGHBOR;Neighboring pixels
diff --git a/rtdata/languages/Czech b/rtdata/languages/Czech
index c1610bb87..d884dd5ce 100644
--- a/rtdata/languages/Czech
+++ b/rtdata/languages/Czech
@@ -1022,7 +1022,6 @@ SAVEDLG_SUBSAMP;Podvzorkování
SAVEDLG_SUBSAMP_1;Nejlepší komprese
SAVEDLG_SUBSAMP_2;Vyvážené
SAVEDLG_SUBSAMP_3;Nejlepší kvalita
-SAVEDLG_SUBSAMP_TOOLTIP;Nejlepší komprese: 4:1:1\nVyvážená: 4:2:2\nNejlepší kvalita: 4:4:4
SAVEDLG_TIFFUNCOMPRESSED;Nekomprimovaný TIFF
SAVEDLG_WARNFILENAME;Soubor bude pojmenován
SHCSELECTOR_TOOLTIP;Klikněte pravým tlačítkem myši pro obnovení výchozí pozice těchto tří posuvníků.
@@ -1844,6 +1843,7 @@ ZOOMPANEL_ZOOMOUT;Oddálit\nZkratka: -
!PREFERENCES_SERIALIZE_TIFF_READ;Tiff Read Settings
!PREFERENCES_SERIALIZE_TIFF_READ_LABEL;Serialize read of tiff files
!PREFERENCES_SERIALIZE_TIFF_READ_TOOLTIP;When working with folders full of uncompressed tiff files enabling this option can increase performance of thumb generation.
+!SAVEDLG_SUBSAMP_TOOLTIP;Best compression:\nJ:a:b 4:2:0\nh/v 2/2\nChroma halved horizontally and vertically.\n\nBalanced:\nJ:a:b 4:2:2\nh/v 2/1\nChroma halved horizontally.\n\nBest quality:\nJ:a:b 4:4:4\nh/v 1/1\nNo chroma subsampling.
!TP_CROP_GTHARMMEANS;Harmonic Means
!TP_CROP_GTTRIANGLE1;Golden Triangles 1
!TP_CROP_GTTRIANGLE2;Golden Triangles 2
@@ -1870,9 +1870,9 @@ ZOOMPANEL_ZOOMOUT;Oddálit\nZkratka: -
!TP_RETINEX_CURVEEDITOR_CD_TOOLTIP;Luminance according to luminance L=f(L)\nCorrect raw data to reduce halos and artifacts.
!TP_RETINEX_CURVEEDITOR_LH;Strength=f(H)
!TP_RETINEX_CURVEEDITOR_LH_TOOLTIP;Strength according to hue Strength=f(H)\nThis curve also acts on chroma when using the "Highlight" retinex method.
+!TP_RETINEX_FREEGAMMA;Free gamma
!TP_RETINEX_GAIN;Gain
-!TP_RETINEX_GAIN_TOOLTIP;Acts on the transmission in combination with the offset. This is very different from the others settings. Used for black or white pixels, and to help balance the histogram.
-!TP_RETINEX_GAMMA;Free gamma
+!TP_RETINEX_GAIN_TOOLTIP;Acts on the restored image.\n\nThis is very different from the others settings. Used for black or white pixels, and to help balance the histogram.
!TP_RETINEX_GAMMA;Gamma
!TP_RETINEX_GAMMA_FREE;Free
!TP_RETINEX_GAMMA_HIGH;High
@@ -1891,7 +1891,7 @@ ZOOMPANEL_ZOOMOUT;Oddálit\nZkratka: -
!TP_RETINEX_LOW;Low
!TP_RETINEX_MEDIAN;Transmission median filter
!TP_RETINEX_METHOD;Method
-!TP_RETINEX_METHOD_TOOLTIP;Low = Reinforce low light,\nUniform = Equalize action,\nHigh = Reinforce high light,\nHighlight = Remove magenta in highlights.
+!TP_RETINEX_METHOD_TOOLTIP;Low = Reinforce low light,\nUniform = Equalize action,\nHigh = Reinforce high light,\nHighlights = Remove magenta in highlights.
!TP_RETINEX_MLABEL;Restored haze-free Min=%1 Max=%2
!TP_RETINEX_MLABEL_TOOLTIP;Should be near min=0 max=32768\nRestored image with no mixture.
!TP_RETINEX_NEIGHBOR;Neighboring pixels
diff --git a/rtdata/languages/Dansk b/rtdata/languages/Dansk
index 8c3c0d651..9b0b8994c 100644
--- a/rtdata/languages/Dansk
+++ b/rtdata/languages/Dansk
@@ -1211,7 +1211,7 @@ TP_WBALANCE_TEMPERATURE;Temperatur
!SAVEDLG_SUBSAMP_1;Best compression
!SAVEDLG_SUBSAMP_2;Balanced
!SAVEDLG_SUBSAMP_3;Best quality
-!SAVEDLG_SUBSAMP_TOOLTIP;Best compression: 4:1:1\nBalanced: 4:2:2\nBest quality: 4:4:4
+!SAVEDLG_SUBSAMP_TOOLTIP;Best compression:\nJ:a:b 4:2:0\nh/v 2/2\nChroma halved horizontally and vertically.\n\nBalanced:\nJ:a:b 4:2:2\nh/v 2/1\nChroma halved horizontally.\n\nBest quality:\nJ:a:b 4:4:4\nh/v 1/1\nNo chroma subsampling.
!SAVEDLG_TIFFUNCOMPRESSED;Uncompressed TIFF
!SAVEDLG_WARNFILENAME;File will be named
!SHCSELECTOR_TOOLTIP;Click right mouse button to reset the position of those 3 sliders.
@@ -1682,9 +1682,9 @@ TP_WBALANCE_TEMPERATURE;Temperatur
!TP_RETINEX_CURVEEDITOR_CD_TOOLTIP;Luminance according to luminance L=f(L)\nCorrect raw data to reduce halos and artifacts.
!TP_RETINEX_CURVEEDITOR_LH;Strength=f(H)
!TP_RETINEX_CURVEEDITOR_LH_TOOLTIP;Strength according to hue Strength=f(H)\nThis curve also acts on chroma when using the "Highlight" retinex method.
+!TP_RETINEX_FREEGAMMA;Free gamma
!TP_RETINEX_GAIN;Gain
-!TP_RETINEX_GAIN_TOOLTIP;Acts on the transmission in combination with the offset. This is very different from the others settings. Used for black or white pixels, and to help balance the histogram.
-!TP_RETINEX_GAMMA;Free gamma
+!TP_RETINEX_GAIN_TOOLTIP;Acts on the restored image.\n\nThis is very different from the others settings. Used for black or white pixels, and to help balance the histogram.
!TP_RETINEX_GAMMA;Gamma
!TP_RETINEX_GAMMA_FREE;Free
!TP_RETINEX_GAMMA_HIGH;High
@@ -1703,7 +1703,7 @@ TP_WBALANCE_TEMPERATURE;Temperatur
!TP_RETINEX_LOW;Low
!TP_RETINEX_MEDIAN;Transmission median filter
!TP_RETINEX_METHOD;Method
-!TP_RETINEX_METHOD_TOOLTIP;Low = Reinforce low light,\nUniform = Equalize action,\nHigh = Reinforce high light,\nHighlight = Remove magenta in highlights.
+!TP_RETINEX_METHOD_TOOLTIP;Low = Reinforce low light,\nUniform = Equalize action,\nHigh = Reinforce high light,\nHighlights = Remove magenta in highlights.
!TP_RETINEX_MLABEL;Restored haze-free Min=%1 Max=%2
!TP_RETINEX_MLABEL_TOOLTIP;Should be near min=0 max=32768\nRestored image with no mixture.
!TP_RETINEX_NEIGHBOR;Neighboring pixels
diff --git a/rtdata/languages/Deutsch b/rtdata/languages/Deutsch
index a7afd6fdc..796642ccc 100644
--- a/rtdata/languages/Deutsch
+++ b/rtdata/languages/Deutsch
@@ -20,6 +20,8 @@
#20 2013-02-27 Erweiterung (cytrinox)
#21 2013-12-31 Erweiterung (Ingo)
#22 2015-09-04 komplette Überarbeitung (TooWaBoo)
+#23 2015-10-24 Retinexübersetzung und Korrekturen (TooWaBoo)
+#24 2015-11-01 Korrekturen (TooWaBoo) RT4.2.450
ABOUT_TAB_BUILD;Version
ABOUT_TAB_CREDITS;Danksagungen
@@ -271,16 +273,16 @@ HISTORY_MSG_18;-
HISTORY_MSG_19;L*a*b* - L-Kurve
HISTORY_MSG_20;Schärfung
HISTORY_MSG_21;Schärfung\nUnschärfemaskierung\nRadius
-HISTORY_MSG_22;Schärfung\nUnschärfemaskierung\nStärke
+HISTORY_MSG_22;Schärfung\nUnschärfemaskierung\nIntensität
HISTORY_MSG_23;Schärfung\nUnschärfemaskierung\nSchwellenwert
HISTORY_MSG_24;Schärfung\nUnschärfemaskierung\nNur Kanten schärfen
HISTORY_MSG_25;Schärfung\nUnschärfemaskierung\nKantenradius
HISTORY_MSG_26;Schärfung\nUnschärfemaskierung\nKantentoleranz
HISTORY_MSG_27;Schärfung\nUnschärfemaskierung\nHalokontrolle
-HISTORY_MSG_28;Schärfung\nUnschärfemaskierung\nHalokontrolle - Stärke
+HISTORY_MSG_28;Schärfung\nUnschärfemaskierung\nHalokontrolle - Intensität
HISTORY_MSG_29;Schärfung - Methode
HISTORY_MSG_30;Schärfung\nDekonvolution\nRadius
-HISTORY_MSG_31;Schärfung\nDekonvolution\nStärke
+HISTORY_MSG_31;Schärfung\nDekonvolution\nIntensität
HISTORY_MSG_32;Schärfung\nDekonvolution\nDämpfung
HISTORY_MSG_33;Schärfung\nDekonvolution\nIterationen
HISTORY_MSG_34;Objektivkorrektur\nProfil\nVerzeichnung
@@ -321,7 +323,7 @@ HISTORY_MSG_68;Belichtung\nLichterkompression\nMethode
HISTORY_MSG_69;Farbmanagement\nArbeitsfarbraum
HISTORY_MSG_70;Farbmanagement\nAusgabeprofil
HISTORY_MSG_71;Eingangsfarbprofil
-HISTORY_MSG_72;Objektivkorrektur\nVignettierung\nStärke
+HISTORY_MSG_72;Objektivkorrektur\nVignettierung\nIntensität
HISTORY_MSG_73;RGB-Kanalmixer
HISTORY_MSG_74;Größe ändern\nMaßstab
HISTORY_MSG_75;Größe ändern\nMethode
@@ -392,8 +394,8 @@ HISTORY_MSG_139;Schwarzpunkt Blau
HISTORY_MSG_140;Schwarzpunkt Grün 2
HISTORY_MSG_141;Schwarzpunkt\nGrün-Werte angleichen
HISTORY_MSG_142;Kantenschärfung\nIterationen
-HISTORY_MSG_143;Kantenschärfung\nStärke
-HISTORY_MSG_144;Mikrokontrast\nStärke
+HISTORY_MSG_143;Kantenschärfung\nIntensität
+HISTORY_MSG_144;Mikrokontrast\nIntensität
HISTORY_MSG_145;Mikrokontrast\nGleichmäßigkeit
HISTORY_MSG_146;Kantenschärfung
HISTORY_MSG_147;Kantenschärfung\nNur Luminanz
@@ -407,7 +409,7 @@ HISTORY_MSG_154;Dynamik\nHautfarbtöne schützen
HISTORY_MSG_155;Dynamik\nFarbverschiebungen\nvermeiden
HISTORY_MSG_156;Dynamik\nPastell und gesättigte\nTöne koppeln
HISTORY_MSG_157;Dynamik\nPastell/gesättigte Töne\nSchwellenwert
-HISTORY_MSG_158;Dynamikkompression\nStärke
+HISTORY_MSG_158;Dynamikkompression\nIntensität
HISTORY_MSG_159;Dynamikkompression\nKantenschutz
HISTORY_MSG_160;Dynamikkompression\nFaktor
HISTORY_MSG_161;Dynamikkompression\nIterationen
@@ -415,8 +417,8 @@ HISTORY_MSG_162;Dynamikkompression
HISTORY_MSG_163;RGB-Kurven - Rot
HISTORY_MSG_164;RGB-Kurven - Grün
HISTORY_MSG_165;RGB-Kurven - Blau
-HISTORY_MSG_166;Belichtung - Neutral
-HISTORY_MSG_167;Demosaikmethode
+HISTORY_MSG_166;Belichtung - Zurücksetzen
+HISTORY_MSG_167;--unused--
HISTORY_MSG_168;L*a*b* - CC-Kurve
HISTORY_MSG_169;L*a*b* - CH-Kurve
HISTORY_MSG_170;Dynamik - HH-Kurve
@@ -460,7 +462,7 @@ HISTORY_MSG_207;Farbsaum entfernen\nFarbtonkurve
HISTORY_MSG_208;Weißabgleich\nBau/Rot-Korrektur
HISTORY_MSG_210;Grauverlaufsfilter\nRotationswinkel
HISTORY_MSG_211;Grauverlaufsfilter
-HISTORY_MSG_212;Vignettierungsfilter\nStärke
+HISTORY_MSG_212;Vignettierungsfilter\nIntensität
HISTORY_MSG_213;Vignettierungsfilter
HISTORY_MSG_214;Schwarz/Weiß
HISTORY_MSG_215;Schwarz/Weiß - Rot
@@ -487,7 +489,7 @@ HISTORY_MSG_235;Schwarz/Weiß\nAuto-Kanalmixer
HISTORY_MSG_236;--unused--
HISTORY_MSG_237;Schwarz/Weiß - Mixer
HISTORY_MSG_238;Grauverlaufsfilter\nBereich
-HISTORY_MSG_239;Grauverlaufsfilter\nStärke
+HISTORY_MSG_239;Grauverlaufsfilter\nIntensität
HISTORY_MSG_240;Grauverlaufsfilter\nRotationsachsen
HISTORY_MSG_241;Vignettierungsfilter\nBereich
HISTORY_MSG_242;Vignettierungsfilter\nRundung
@@ -529,9 +531,9 @@ HISTORY_MSG_277;--unused--
HISTORY_MSG_278;Farbanpassungen\nLuminanz schützen
HISTORY_MSG_279;Farbanpassungen\nSchatten
HISTORY_MSG_280;Farbanpassungen\nLichter
-HISTORY_MSG_281;Farbanpassungen\nSättigung schützen\nStärke
+HISTORY_MSG_281;Farbanpassungen\nSättigung schützen\nIntensität
HISTORY_MSG_282;Farbanpassungen\nSättigung schützen\nSchwellenwert
-HISTORY_MSG_283;Farbanpassungen\nStärke
+HISTORY_MSG_283;Farbanpassungen\nIntensität
HISTORY_MSG_284;Farbanpassungen\nSättigung schützen\nAutomatisch
HISTORY_MSG_285;Rauschreduzierung\nMedianmethode
HISTORY_MSG_286;Rauschreduzierung\nMediantyp
@@ -542,7 +544,7 @@ HISTORY_MSG_290;Schwarzpunkt - Rot
HISTORY_MSG_291;Schwarzpunkt - Grün
HISTORY_MSG_292;Schwarzpunkt - Blau
HISTORY_MSG_293;Filmsimulation
-HISTORY_MSG_294;Filmsimulation - Stärke
+HISTORY_MSG_294;Filmsimulation - Intensität
HISTORY_MSG_295;Filmsimulation - Film
HISTORY_MSG_296;Rauschreduzierung\nLuminanzkurve
HISTORY_MSG_297;Rauschreduzierung\nQualität
@@ -554,12 +556,12 @@ HISTORY_MSG_302;Rauschreduzierung\nChrominanz\nMethode
HISTORY_MSG_303;Rauschreduzierung\nChrominanz\nMethode
HISTORY_MSG_304;Wavelet\nKontrastebenen
HISTORY_MSG_305;Wavelet
-HISTORY_MSG_306;Wavelet\nEinstellungen\nVerarbeitungsebene
-HISTORY_MSG_307;Wavelet\nEinstellungen\nVerarbeitung
-HISTORY_MSG_308;Wavelet\nEinstellungen\nVerarbeitungsrichtung
+HISTORY_MSG_306;Wavelet - Einstellungen\nVerarbeitungsebene
+HISTORY_MSG_307;Wavelet - Einstellungen\nVerarbeitung
+HISTORY_MSG_308;Wavelet - Einstellungen\nVerarbeitungsrichtung
HISTORY_MSG_309;Wavelet\nKantenschärfung\nDetails
HISTORY_MSG_310;Wavelet - Nachbild\nHimmelsfarbtöne\nändern/schützen
-HISTORY_MSG_311;Wavelet\nEinstellungen\nWaveletebenen
+HISTORY_MSG_311;Wavelet - Einstellungen\nWaveletebenen
HISTORY_MSG_312;Wavelet - Nachbild\nSchatten Schwellenwert
HISTORY_MSG_313;Wavelet\nFarbe\nSättigung
HISTORY_MSG_314;Wavelet\nGamut\nArtefakte reduzieren
@@ -580,16 +582,16 @@ HISTORY_MSG_328;Wavelet - Farbe\nVerlinkungsstärke
HISTORY_MSG_329;Wavelet - Tönung\nDeckkraft Rot/Grün
HISTORY_MSG_330;Wavelet - Tönung\nDeckkraft Blau/Gelb
HISTORY_MSG_331;Wavelet\nKontrastebenen\nExtra
-HISTORY_MSG_332;Wavelet\nEinstellungen\nKachelgröße
+HISTORY_MSG_332;Wavelet- -Einstellungen\nKachelgröße
HISTORY_MSG_333;Wavelet - Nachbild\nSchatten
HISTORY_MSG_334;Wavelet - Nachbild\nBuntheit
HISTORY_MSG_335;Wavelet - Nachbild\nLichter
HISTORY_MSG_336;Wavelet - Nachbild\nLichter Schwellenwert
HISTORY_MSG_337;Wavelet - Nachbild\nHimmelsfarbton
HISTORY_MSG_338;Wavelet\nKantenschärfung\nRadius
-HISTORY_MSG_339;Wavelet\nKantenschärfung\nStärke
-HISTORY_MSG_340;Wavelet\nEinstellungen\nStärke
-HISTORY_MSG_341;Wavelet\nEinstellungen\nKantenperformance
+HISTORY_MSG_339;Wavelet\nKantenschärfung\nIntensität
+HISTORY_MSG_340;Wavelet - Einstellungen\nIntensität
+HISTORY_MSG_341;Wavelet - Einstellungen\nKantenperformance
HISTORY_MSG_342;Wavelet\nKantenschärfung\nErste Ebene
HISTORY_MSG_343;Wavelet - Farbe\nFarbebenen
HISTORY_MSG_344;Wavelet\nFarbemethode\nRegler/Kurve
@@ -600,7 +602,7 @@ HISTORY_MSG_348;Wavelet\nRauschreduzierung\nEbene 2
HISTORY_MSG_349;Wavelet\nRauschreduzierung\nEbene 3
HISTORY_MSG_350;Wavelet\nKantenschärfung\nKantenerkennung
HISTORY_MSG_351;Wavelet - Nachbild\nHH-Kurve
-HISTORY_MSG_352;Wavelet\nEinstellungen\nHintergrund
+HISTORY_MSG_352;Wavelet - Einstellungen\nHintergrund
HISTORY_MSG_353;Wavelet\nKantenschärfung\nGradienten-\nempfindlichkeit
HISTORY_MSG_354;Wavelet\nKantenschärfung\nErweitert
HISTORY_MSG_355;Wavelet\nKantenschärfung\nSchwellenwert niedrig
@@ -609,7 +611,7 @@ HISTORY_MSG_357;Wavelet\nRauschreduzierung\nSchärfung
HISTORY_MSG_358;Wavelet - Gamut\nKontrastkurve
HISTORY_MSG_359;Vorverarbeitung\nHot/Dead-Pixel\nSchwellenwert
HISTORY_MSG_360;Dynamikkompression\nGamma
-HISTORY_MSG_361;Wavelet - Endretusche\nFarbeausgleich
+HISTORY_MSG_361;Wavelet - Endretusche\nFarbausgleich
HISTORY_MSG_362;Wavelet - Nachbild\nKompression
HISTORY_MSG_363;Wavelet - Nachbild\nKompressionsstärke
HISTORY_MSG_364;Wavelet - Endretusche\nKontrastausgleich
@@ -621,16 +623,16 @@ HISTORY_MSG_369;Wavelet - Endretusche\nKontrastmethode
HISTORY_MSG_370;Wavelet - Endretusche\nLokale Kontrastkurve
HISTORY_MSG_371;Nach Größenänderung\nschärfen
HISTORY_MSG_372;Größe ändern\nSchärfen - USM\nRadius
-HISTORY_MSG_373;Größe ändern\nSchärfen - USM\nStärke
+HISTORY_MSG_373;Größe ändern\nSchärfen - USM\nIntensität
HISTORY_MSG_374;Größe ändern\nSchärfen - USM\nSchwellenwert
HISTORY_MSG_375;Größe ändern\nSchärfen - USM\nNur Kanten schärfen
HISTORY_MSG_376;Größe ändern\nSchärfen - USM\nKantenerkennung Radius
HISTORY_MSG_377;Größe ändern\nSchärfen - USM\nKantentoleranz
HISTORY_MSG_378;Größe ändern\nSchärfen - USM\nHalokontrolle
-HISTORY_MSG_379;Größe ändern\nSchärfen - USM\nHalokontrolle Stärke
+HISTORY_MSG_379;Größe ändern\nSchärfen - USM\nHalokontrolle Intensität
HISTORY_MSG_380;Größe ändern\nSchärfen - Methode
HISTORY_MSG_381;Größe ändern\nSchärfen - RLD\nRadius
-HISTORY_MSG_382;Größe ändern\nSchärfen - RLD\nStärke
+HISTORY_MSG_382;Größe ändern\nSchärfen - RLD\nIntensität
HISTORY_MSG_383;Größe ändern\nSchärfen - RLD\nDämpfung
HISTORY_MSG_384;Größe ändern\nSchärfen - RLD\nIterationen
HISTORY_MSG_385;Wavelet - Nachbild\nFarbausgleich
@@ -655,6 +657,26 @@ HISTORY_MSG_403;Wavelet\nKantenschärfung\nKantenempfindlichkeit
HISTORY_MSG_404;Wavelet\nKantenschärfung\nGrundverstärkung
HISTORY_MSG_405;Wavelet\nRauschreduzierung\nEbene 4
HISTORY_MSG_406;Wavelet\nKantenschärfung\nNachbarpixel
+HISTORY_MSG_407;Retinex - Methode
+HISTORY_MSG_408;Retinex\nBenachbarte Pixel
+HISTORY_MSG_409;Retinex - Verstärkung
+HISTORY_MSG_410;Retinex - Versatz
+HISTORY_MSG_411;Retinex - Intensität
+HISTORY_MSG_412;Retinex - Skalierung
+HISTORY_MSG_413;Retinex - Abweichung
+HISTORY_MSG_414;Retinex\nLuminanz(L)\nL*a*b*
+HISTORY_MSG_415;Retinex\nTransmissionskurve
+HISTORY_MSG_416;Retinex
+HISTORY_MSG_417;Retinex\nTransmission median
+HISTORY_MSG_418;Retinex - Transmission\nSchwellenwert
+HISTORY_MSG_419;Retinex - Farbraum
+HISTORY_MSG_420;Retinex\nHSL-Kurve
+HISTORY_MSG_421;Retinex\nGammakorrektur
+HISTORY_MSG_422;Retinex - Gamma
+HISTORY_MSG_423;Retinex\nGammasteigung
+HISTORY_MSG_424;Retinex\nHL-Schwellenwert
+HISTORY_MSG_425;Retinex\nBasis-Logarithmus
+HISTORY_MSG_426;Retinex - Farbton (H)
HISTORY_NEWSNAPSHOT;Hinzufügen
HISTORY_NEWSNAPSHOT_TOOLTIP;Taste: Alt + s
HISTORY_SNAPSHOTS;Schnappschüsse
@@ -844,6 +866,7 @@ PARTIALPASTE_RAW_DMETHOD;Demosaikmethode
PARTIALPASTE_RAW_FALSECOLOR;Farbinterpolation: Falschfarbenunterdrückung
PARTIALPASTE_RAW_LMMSEITERATIONS;LMMSE-Verbesserungsstufen
PARTIALPASTE_RESIZE;Größe ändern
+PARTIALPASTE_RETINEX;Retinex (Bildschleier entfernen)
PARTIALPASTE_RGBCURVES;RGB-Kurven
PARTIALPASTE_ROTATION;Drehen
PARTIALPASTE_SHADOWSHIGHLIGHTS;Schatten/Lichter
@@ -1106,7 +1129,7 @@ SAVEDLG_SUBSAMP;Komprimierung
SAVEDLG_SUBSAMP_1;Beste Kompression
SAVEDLG_SUBSAMP_2;Ausgeglichen
SAVEDLG_SUBSAMP_3;Beste Qualität
-SAVEDLG_SUBSAMP_TOOLTIP;Beste Kompression: 4:1:1\nAusgeglichen: 4:2:2\nBeste Qualität: 4:4:4
+SAVEDLG_SUBSAMP_TOOLTIP;Beste Kompression: 4:2:0\nAusgeglichen: 4:2:2\nBeste Qualität: 4:4:4
SAVEDLG_TIFFUNCOMPRESSED;Unkomprimiertes TIFF
SAVEDLG_WARNFILENAME;Die Datei wird gespeichert als
SHCSELECTOR_TOOLTIP;Um die 3 Regler zurückzusetzen, rechte Maustaste klicken.
@@ -1287,15 +1310,15 @@ TP_COLORTONING_NEUTRAL_TIP;Alle Werte auf Standard zurücksetzen\n(Schatten, Mit
TP_COLORTONING_OPACITY;Deckkraft
TP_COLORTONING_RGBCURVES;RGB-Kurven
TP_COLORTONING_RGBSLIDERS;RGB-Regler
-TP_COLORTONING_SATURATEDOPACITY;Stärke
+TP_COLORTONING_SATURATEDOPACITY;Intensität
TP_COLORTONING_SATURATIONTHRESHOLD;Schwellenwert
TP_COLORTONING_SA;Sättigung schützen
TP_COLORTONING_SHADOWS;Schatten
TP_COLORTONING_SPLITCOCO;Farbausgleich (Schatten/Mitten/Lichter)
TP_COLORTONING_SPLITCO;Schatten/Mitten/Lichter
TP_COLORTONING_SPLITLR;Sättigung (2 Farben)
-TP_COLORTONING_STRENGTH;Stärke
-TP_COLORTONING_STR;Stärke
+TP_COLORTONING_STRENGTH;Intensität
+TP_COLORTONING_STR;Intensität
TP_COLORTONING_TWO2;Spezial-Farbe (2 Farben)
TP_COLORTONING_TWOALL;Spezial-Farbe
TP_COLORTONING_TWOBY;Spezial a* und b*
@@ -1334,12 +1357,12 @@ TP_DIRPYRDENOISE_AUTO;Automatisch Global
TP_DIRPYRDENOISE_AUTO_TOOLTIP;Bewertung des Farbrauschens.\nDie Bewertung ist ungenau und sehr subjektiv!
TP_DIRPYRDENOISE_AUT;Automatisch Global
TP_DIRPYRDENOISE_BLUE;Delta-Chrominanz Blau/Gelb
-TP_DIRPYRDENOISE_C2TYPE_TOOLTIP;Manuell:\nPassen Sie die Chrominanz-Rauschreduzierung manuell an.\n\nAutomatisch Global:\nEs werden 9 Zonen für die Berechnung der Chrominanz-Rauschreduzierung verwendet.\n\nVorschau:\nNur der sichbare Teil des Bildes wird für die Berechnung der Chrominanz-Rauschreduzierung verwendet.
+TP_DIRPYRDENOISE_C2TYPE_TOOLTIP;Benutzerdefiniert:\nManuelle Anpassung der Chrominanz-Rauschreduzierung.\n\nAutomatisch Global:\nEs werden 9 Zonen für die Berechnung der Chrominanz-Rauschreduzierung verwendet.\n\nVorschau:\nNur der sichbare Teil des Bildes wird für die Berechnung der Chrominanz-Rauschreduzierung verwendet.
TP_DIRPYRDENOISE_CCCURVE;Chrominanzkurve
TP_DIRPYRDENOISE_CHROMAFR;Chrominanz
TP_DIRPYRDENOISE_CHROMA;Chrominanz (Master)
TP_DIRPYRDENOISE_CTYPE;Methode
-TP_DIRPYRDENOISE_CTYPE_TOOLTIP;Manuell:\nPassen Sie die Chrominanz-Rauschreduzierung manuell an.\n\nAutomatisch Global:\nEs werden 9 Zonen für die Berechnung der Chrominanz-Rauschreduzierung verwendet.\n\nAuto-Multizonen:\nKeine Voransicht - wird erst beim Speichern angewendet.\nAbhängig von der Bildgröße, wird das Bild in ca. 10 bis 70 Kacheln aufgeteilt. Für jede Kachel wird die Chrominanz-Rauschreduzierung individuell berechnet.\n\nVorschau:\nNur der sichbare Teil des Bildes wird für die Berechnung der Chrominanz-Rauschreduzierung verwendet.
+TP_DIRPYRDENOISE_CTYPE_TOOLTIP;Benutzerdefiniert:\nManuelle Anpassung der Chrominanz-Rauschreduzierung.\n\nAutomatisch Global:\nEs werden 9 Zonen für die Berechnung der Chrominanz-Rauschreduzierung verwendet.\n\nAuto-Multizonen:\nKeine Voransicht - wird erst beim Speichern angewendet.\nAbhängig von der Bildgröße, wird das Bild in ca. 10 bis 70 Kacheln aufgeteilt. Für jede Kachel wird die Chrominanz-Rauschreduzierung individuell berechnet.\n\nVorschau:\nNur der sichbare Teil des Bildes wird für die Berechnung der Chrominanz-Rauschreduzierung verwendet.
TP_DIRPYRDENOISE_CURVEEDITOR_CC;Farbe
TP_DIRPYRDENOISE_CURVEEDITOR_CC_TOOLTIP;Erhöht den Wert aller Chrominanz-Regler und regelt die Chrominanz-Rauschreduzierung als Funktion der Chromatizität. Die Intensität kann über Kontrollpunkte für schwach bis intensiv gesättigte Farben unterschiedlich eingestellt werden.
TP_DIRPYRDENOISE_CURVEEDITOR_L_TOOLTIP;Moduliert die Wirkung der Luminanz-Rauschreduzierung
@@ -1348,7 +1371,7 @@ TP_DIRPYRDENOISE_ENABLED_TOOLTIP;Kann für RAW und Nicht-RAW-Bilder verwendet we
TP_DIRPYRDENOISE_ENH;Erweiterter Modus
TP_DIRPYRDENOISE_ENH_TOOLTIP;Erhöht die Qualität der Rauschreduzierung auf Kosten einer um 20% erhöhten Verarbeitungszeit.
TP_DIRPYRDENOISE_GAMMA;Gamma
-TP_DIRPYRDENOISE_GAMMA_TOOLTIP;Mit Gamma kann die Stärke der Rauschreduzierung über den Farbbereich variiert werden. Bei kleinen Werten sind nur dunkle Farbtöne betroffen, bei größeren Werten wird der Effekt auf hellere Töne ausgeweitet.
+TP_DIRPYRDENOISE_GAMMA_TOOLTIP;Mit Gamma kann die Intensität der Rauschreduzierung über den Farbbereich variiert werden. Bei kleinen Werten sind nur dunkle Farbtöne betroffen, bei größeren Werten wird der Effekt auf hellere Töne ausgeweitet.
TP_DIRPYRDENOISE_LABEL;Rauschreduzierung
TP_DIRPYRDENOISE_LABM;L*a*b*
TP_DIRPYRDENOISE_LAB;L*a*b*
@@ -1360,8 +1383,8 @@ TP_DIRPYRDENOISE_LTYPE;Luminanzkontrolle
TP_DIRPYRDENOISE_LUMAFR;Luminanz
TP_DIRPYRDENOISE_LUMAFR_TOOLTIP;Wavelet mit Luminanz- und Fourierumwandlung für Luminanzdetails.
TP_DIRPYRDENOISE_LUMA;Luminanz
-TP_DIRPYRDENOISE_MANU;Manuell
-TP_DIRPYRDENOISE_MAN;Manuell
+TP_DIRPYRDENOISE_MANU;Benutzerdefiniert
+TP_DIRPYRDENOISE_MAN;Benutzerdefiniert
TP_DIRPYRDENOISE_MEDMETHOD;Medianmethode
TP_DIRPYRDENOISE_MEDTYPE;Mediantyp
TP_DIRPYRDENOISE_MED;Medianfilter
@@ -1404,7 +1427,7 @@ TP_DIRPYREQUALIZER_SKIN;Hautfarbtöne ändern/schützen
TP_DIRPYREQUALIZER_SKIN_TOOLTIP;-100: Nur Farben innerhalb des Bereichs werden verändert.\n0: Alle Farben werden gleich behandelt.\n+100: Nur Farben außerhalb des Bereichs werden verändert.
TP_DIRPYREQUALIZER_THRESHOLD;Schwellenwert
TP_DIRPYREQUALIZER_TOOLTIP;Verringert Artefakte an den Übergängen zwischen Hautfarbtöne und dem Rest des Bildes.
-TP_DISTORTION_AMOUNT;Stärke
+TP_DISTORTION_AMOUNT;Intensität
TP_DISTORTION_AUTO;Autom. Verzeichnungskorrektur
TP_DISTORTION_AUTO_TIP;Objektivverzeichnungen automatisch korrigieren (nur für bestimmte Kameras, z.B. Micro 4/3, einige Kompaktkameras, usw.)
TP_DISTORTION_LABEL;Verzeichnungskorrektur
@@ -1413,7 +1436,7 @@ TP_EPD_GAMMA;Gamma
TP_EPD_LABEL;Dynamikkompression
TP_EPD_REWEIGHTINGITERATES;Iterationen
TP_EPD_SCALE;Faktor
-TP_EPD_STRENGTH;Stärke
+TP_EPD_STRENGTH;Intensität
TP_EPD_TOOLTIP;Dynamikkompression ist mit dem L*a*b*- und CIECAM02-Modus möglich.\n\nFür den CIECAM02-Modus müssen folgende Optionen aktiviert sein:\n1. CIECAM02\n2. Algorithmus = Helligkeit + Farbigkeit (QM)\n3. Dynamikkompression mittels CIECAM02-Helligkeit (Q)
TP_EXPOSURE_AUTOLEVELS;Auto
TP_EXPOSURE_AUTOLEVELS_TIP;Automatische Belichtungseinstellung basierend auf Bildanalyse
@@ -1442,7 +1465,7 @@ TP_EXPOSURE_TCMODE_WEIGHTEDSTD;Gewichteter Standard
TP_EXPOS_BLACKPOINT_LABEL;Schwarzpunkt
TP_EXPOS_WHITEPOINT_LABEL;Weißpunkt
TP_FILMSIMULATION_LABEL;Filmsimulation
-TP_FILMSIMULATION_STRENGTH;Stärke
+TP_FILMSIMULATION_STRENGTH;Intensität
TP_FILMSIMULATION_ZEROCLUTSFOUND;HaldCLUT-Verzeichnis in den Einstellungen festlegen
TP_FLATFIELD_AUTOSELECT;Automatische Auswahl
TP_FLATFIELD_BLURRADIUS;Unschärferadius
@@ -1469,7 +1492,7 @@ TP_GRADIENT_DEGREE_TOOLTIP;Rotationswinkel in Grad
TP_GRADIENT_FEATHER;Bereich
TP_GRADIENT_FEATHER_TOOLTIP;Bereich des Verlaufs in Prozent der Bilddiagonalen
TP_GRADIENT_LABEL;Grauverlaufsfilter
-TP_GRADIENT_STRENGTH;Stärke
+TP_GRADIENT_STRENGTH;Intensität
TP_GRADIENT_STRENGTH_TOOLTIP;Filterstärke in Blendenstufen
TP_HLREC_BLEND;Überlagerung
TP_HLREC_CIELAB;CIELab-Überlagerung
@@ -1562,14 +1585,14 @@ TP_LENSPROFILE_LABEL;Objektivkorrekturprofil
TP_LENSPROFILE_USECA;CA korrigieren
TP_LENSPROFILE_USEDIST;Verzeichnung korrigieren
TP_LENSPROFILE_USEVIGN;Vignettierung korrigieren
-TP_NEUTRAL;Neutral
+TP_NEUTRAL;Zurücksetzen
TP_NEUTRAL_TIP;Belichtungseinstellungen auf neutrale Werte zurücksetzen
TP_PCVIGNETTE_FEATHER;Bereich
TP_PCVIGNETTE_FEATHER_TOOLTIP;Bereich:\n0 = nur Bildecken\n50 = halbe Strecke zum Mittelpunkt\n100 = bis zum Mittelpunkt
TP_PCVIGNETTE_LABEL;Vignettierungsfilter
TP_PCVIGNETTE_ROUNDNESS;Rundung
TP_PCVIGNETTE_ROUNDNESS_TOOLTIP;Rundung:\n0 = Rechteck\n50 = Ellipse\n100 = Kreis
-TP_PCVIGNETTE_STRENGTH;Stärke
+TP_PCVIGNETTE_STRENGTH;Intensität
TP_PCVIGNETTE_STRENGTH_TOOLTIP;Filterstärke in Blendenstufen (bezogen auf die Bildecken)
TP_PERSPECTIVE_HORIZONTAL;Horizontal
TP_PERSPECTIVE_LABEL;Perspektive
@@ -1630,6 +1653,54 @@ TP_RESIZE_SCALE;Maßstab
TP_RESIZE_SPECIFY;Vorgabe:
TP_RESIZE_WIDTH;Breite
TP_RESIZE_W;Breite:
+TP_RETINEX_CONTEDIT_HSL;HSL-Kurve
+TP_RETINEX_CONTEDIT_LAB;Luminanz (L) L*a*b*
+TP_RETINEX_CONTEDIT_LH;Farbton (H)
+TP_RETINEX_CURVEEDITOR_CD;L=f(L)
+TP_RETINEX_CURVEEDITOR_CD_TOOLTIP;Luminanz in Abhängigkeit der Luminanz.\nKorrigiert direkt die RAW-Daten, um Halos und Artefakte zu verringern.
+TP_RETINEX_CURVEEDITOR_LH;Intensität=f(H)
+TP_RETINEX_CURVEEDITOR_LH_TOOLTIP;Intensität in Abhängikeit des Farbtons (H)\nBei der Retinex-Methode "Spitzlichter" wirken sich die Änderungen auch auf die Chromakorrektur aus.
+TP_RETINEX_FREEGAMMA;Gamma
+TP_RETINEX_GAIN;Verstärkung
+TP_RETINEX_GAIN_TOOLTIP;In Kombination mit dem Versatz beeinflusst die Einstellung die Transmission. Wird für schwarze oder weiße Pixel verwendet und hilft das Histogram auszugleichen.
+TP_RETINEX_GAMMA;Gammakorrektur
+TP_RETINEX_GAMMA_FREE;Benutzerdefiniert
+TP_RETINEX_GAMMA_HIGH;Hoch
+TP_RETINEX_GAMMA_LOW;Niedrig
+TP_RETINEX_GAMMA_MID;Mittel
+TP_RETINEX_GAMMA_NONE;Keine
+TP_RETINEX_GAMMA_TOOLTIP;Stellt Farbtöne vor und nach der Retinexverarbeitung durch eine Gammakorrektur wieder her.
+TP_RETINEX_HIGHLIGHT;Spitzlichter Schwellenwert
+TP_RETINEX_HIGHLIGHT_TOOLTIP;Benötigt unter Umständen Korrekturen der Einstellungen "Benachbarte Pixel" und "Weißpunkt" unter dem Reiter "RAW".
+TP_RETINEX_HIGHLIG;Spitzlichter
+TP_RETINEX_HIGH;Lichter
+TP_RETINEX_HSLSPACE_LIN;HSL-Linear
+TP_RETINEX_HSLSPACE_LOG;HSL-Logarithmisch
+TP_RETINEX_LABEL;Retinex (Bildschleier entfernen)
+TP_RETINEX_LABSPACE;L*a*b*
+TP_RETINEX_LOW;Schatten
+TP_RETINEX_MEDIAN;Transmission Medianfilter
+TP_RETINEX_METHOD;Methode
+TP_RETINEX_METHOD_TOOLTIP;"Schatten" wirkt sich auf dunkle Bereiche aus.\n"Schatten & Lichter" wirkt sich auf dunkle und helle Bereiche aus.\n"Lichter" wirkt sich auf helle Bereiche aus.\n"Spitzlichter" wirkt sich auf sehr helle Bereiche aus und reduziert Magenta-Falschfarben.
+TP_RETINEX_MLABEL;Schleierreduzierung: Min=%1 Max=%2
+TP_RETINEX_MLABEL_TOOLTIP;Sollte nahe bei Min=0 und Max=32768 sein
+TP_RETINEX_NEIGHBOR;Benachbarte Pixel
+TP_RETINEX_NEUTRAL;Zurücksetzen
+TP_RETINEX_NEUTRAL_TIP;Setzt alle Regler und Kurven auf ihre Standardwerte zurück.
+TP_RETINEX_OFFSET;Versatz
+TP_RETINEX_SETTINGS;Einstellungen
+TP_RETINEX_SLOPE;Gammasteigung
+TP_RETINEX_STRENGTH;Intensität
+TP_RETINEX_THRESHOLD;Transmission Schwellenwert
+TP_RETINEX_THRESHOLD_TOOLTIP;Limitiert den Bereich der Transmissionskurve.
+TP_RETINEX_TLABEL2;T: Tmin=%1 Tmax=%2
+TP_RETINEX_TLABEL;T: Min=%1 Max=%2 Mittel=%3 Sigma=%4
+TP_RETINEX_TLABEL_TOOLTIP;Ergebis der Transmissionskurve: Min, Max, Mittel und Sigma\nMin und Max hat Einfluss auf die Abweichung.\n\nTmin = Kleinster Wert der Transmissionskurve\nTmax = Größter Wert der Transmissionskurve
+TP_RETINEX_TRANSMISSION;Transmissionskurve
+TP_RETINEX_TRANSMISSION_TOOLTIP;Transmission in Abhängigkeit der Transmission.\nx-Achse: Transmission negativer Werte (Min), Mittel und positiver Werte (Max).\ny-Achse: Verstärkung oder Reduzierung.
+TP_RETINEX_UNIFORM;Schatten & Lichter
+TP_RETINEX_VARIANCE;Abweichung
+TP_RETINEX_VARIANCE_TOOLTIP;Niedrige Werte erhöhen den lokalen Kontrast und die Sättigung, können aber zu Artefakten führen.
TP_RGBCURVES_BLUE;B
TP_RGBCURVES_CHANNEL;Kanal
TP_RGBCURVES_GREEN;G
@@ -1649,27 +1720,27 @@ TP_SHADOWSHLIGHTS_RADIUS;Radius
TP_SHADOWSHLIGHTS_SHADOWS;Schatten
TP_SHADOWSHLIGHTS_SHARPMASK;Schärfemaske
TP_SHADOWSHLIGHTS_SHTONALW;Tonwertbreite Schatten
-TP_SHARPENEDGE_AMOUNT;Stärke
+TP_SHARPENEDGE_AMOUNT;Intensität
TP_SHARPENEDGE_LABEL;Kantenschärfung
TP_SHARPENEDGE_PASSES;Iterationen
TP_SHARPENEDGE_THREE;Nur Luminanz
-TP_SHARPENING_AMOUNT;Stärke
+TP_SHARPENING_AMOUNT;Intensität
TP_SHARPENING_EDRADIUS;Radius
TP_SHARPENING_EDTOLERANCE;Kantentoleranz
TP_SHARPENING_HALOCONTROL;Halokontrolle
-TP_SHARPENING_HCAMOUNT;Stärke
+TP_SHARPENING_HCAMOUNT;Intensität
TP_SHARPENING_LABEL;Schärfung
TP_SHARPENING_METHOD;Methode
TP_SHARPENING_ONLYEDGES;Nur Kanten schärfen
TP_SHARPENING_RADIUS;Radius
TP_SHARPENING_RLD;RL-Dekonvolution
-TP_SHARPENING_RLD_AMOUNT;Stärke
+TP_SHARPENING_RLD_AMOUNT;Intensität
TP_SHARPENING_RLD_DAMPING;Dämpfung
TP_SHARPENING_RLD_ITERATIONS;Iterationen
TP_SHARPENING_THRESHOLD;Schwellenwert
TP_SHARPENING_TOOLTIP;Ergibt einen leicht geänderten Effekt, wenn CIECAM02 verwendet wird.
TP_SHARPENING_USM;Unschärfemaskierung
-TP_SHARPENMICRO_AMOUNT;Stärke
+TP_SHARPENMICRO_AMOUNT;Intensität
TP_SHARPENMICRO_LABEL;Mikrokontrast
TP_SHARPENMICRO_MATRIX;3×3-Matrix statt 5×5-Matrix
TP_SHARPENMICRO_UNIFORMITY;Gleichmäßigkeit
@@ -1690,7 +1761,7 @@ TP_VIBRANCE_PSTHRESHOLD_SATTHRESH;Sättigung Schwellenwert
TP_VIBRANCE_PSTHRESHOLD_TOOLTIP;Die vertikale Achse steht für die Pastell (unten) und gesättigte Töne (oben).\nDie horizontale Achse entspricht dem Sättigungsbereich.
TP_VIBRANCE_PSTHRESHOLD_WEIGTHING;Gewichtung des Übergangs pastell/gesättigt
TP_VIBRANCE_SATURATED;Gesättigte Töne
-TP_VIGNETTING_AMOUNT;Stärke
+TP_VIGNETTING_AMOUNT;Intensität
TP_VIGNETTING_CENTER;Zentrum
TP_VIGNETTING_CENTER_X;Zentrum X
TP_VIGNETTING_CENTER_Y;Zentrum Y
@@ -1721,6 +1792,7 @@ TP_WAVELET_BANONE;Keine
TP_WAVELET_BASLI;Regler
TP_WAVELET_BATYPE;Kontrastmethode
TP_WAVELET_CBENAB;Farbausgleich
+TP_WAVELET_CB_TOOLTIP;Farbausgleich mit getrennten Reglern für Schatten, Mitten und Lichter aktivieren.
TP_WAVELET_CCURVE;Lokaler Kontrast
TP_WAVELET_CH1;Gesamter Farbbereich
TP_WAVELET_CH2;Sättigung/Pastell
@@ -1780,7 +1852,7 @@ TP_WAVELET_EDRAD;Radius
TP_WAVELET_EDRAD_TOOLTIP;Der Radius unterscheidet sich von dem in den üblichen Schärfungswerkzeugen. Der Wert wird mit jeder Ebene über eine komplexe Funktion verglichen. Ein Wert von “0“ zeigt deshalb immer noch eine Auswirkung.
TP_WAVELET_EDSL;Regler
TP_WAVELET_EDTYPE;Lokale Kontrastmethode
-TP_WAVELET_EDVAL;Stärke
+TP_WAVELET_EDVAL;Intensität
TP_WAVELET_FINAL;Endretusche
TP_WAVELET_FINEST;Fein
TP_WAVELET_HIGHLIGHT;Lichter-Luminanzbereich
@@ -1812,7 +1884,7 @@ TP_WAVELET_LIPST;Erweiterter Algorithmus
TP_WAVELET_LOWLIGHT;Schatten-Luminanzbereich
TP_WAVELET_MEDGREINF;Erste Ebene
TP_WAVELET_MEDILEV;Kantenerkennung
-TP_WAVELET_MEDILEV_TOOLTIP;Wenn Sie die Kantenerkennung aktivieren, sollten Sie folgende Einstellungen anpassen:\n\n1. Niedrige Kontrastebenen deaktivieren um Artefakte zu vermeiden.\n2. Hohe Werte bei der Gradientenempfindlichkeit einstellen.\n\nSie können die Stärke mit der Wavelet-Rauschreduzierung anpassen.
+TP_WAVELET_MEDILEV_TOOLTIP;Wenn Sie die Kantenerkennung aktivieren, sollten Sie folgende Einstellungen anpassen:\n\n1. Niedrige Kontrastebenen deaktivieren um Artefakte zu vermeiden.\n2. Hohe Werte bei der Gradientenempfindlichkeit einstellen.\n\nSie können die Intensität mit der Wavelet-Rauschreduzierung anpassen.
TP_WAVELET_MEDI;Artefakte in blauem Himmel reduzieren
TP_WAVELET_NEUTRAL;Neutral
TP_WAVELET_NOISE;Rauschreduzierung
@@ -1841,8 +1913,8 @@ TP_WAVELET_SKIN;Hautfarbtöne ändern/schützen
TP_WAVELET_SKIN_TOOLTIP;-100: Nur Farben innerhalb des Bereichs werden verändert.\n0: Alle Farben werden gleich behandelt.\n+100: Nur Farben außerhalb des Bereichs werden verändert.
TP_WAVELET_SKY;Himmelsfarbtöne ändern/schützen
TP_WAVELET_SKY_TOOLTIP;-100: Nur Farben innerhalb des Bereichs werden verändert.\n0: Alle Farben werden gleich behandelt.\n+100: Nur Farben außerhalb des Bereichs werden verändert.
-TP_WAVELET_STRENGTH;Stärke
-TP_WAVELET_STREN;Stärke
+TP_WAVELET_STRENGTH;Intensität
+TP_WAVELET_STREN;Intensität
TP_WAVELET_SUPE;Extra
TP_WAVELET_THRESHOLD2;Schattenebenen
TP_WAVELET_THRESHOLD2_TOOLTIP;Legt die Ebene der Untergrenze (9 minus Wert) für den Schatten-Luminanzbereich fest. Der maximal mögliche Wert wird vom Wert der Lichterebenen begrenzt.\n\nBeeinflussbare Ebenen: Untergrenze bis Ebene 9
@@ -1855,8 +1927,8 @@ TP_WAVELET_TILESFULL;Ganzes Bild
TP_WAVELET_TILESIZE;Kachelgröße
TP_WAVELET_TILESLIT;Kleine Kacheln
TP_WAVELET_TILES_TOOLTIP;“Ganzes Bild“ (empfohlen) liefert eine bessere Qualität.\n“Kacheln“ benötigen weniger Speicher und sind nur für Computer mit wenig RAM zu empfehlen.
-TP_WAVELET_TMSTRENGTH;Stärke
-TP_WAVELET_TMSTRENGTH_TOOLTIP;Kontrolliert die Stärke der Dynamik- oder Kontrastkompression des Nachbildes. Ist der Wert ungleich 0, werden die Stärke- und Gammaregler des Dynamikkompressions-Werkzeugs im Belichtungsreiter deaktiviert.
+TP_WAVELET_TMSTRENGTH;Intensität
+TP_WAVELET_TMSTRENGTH_TOOLTIP;Kontrolliert die Intensität der Dynamik- oder Kontrastkompression des Nachbildes. Ist der Wert ungleich 0, werden die Intensitäts- und Gammaregler des Dynamikkompressions-Werkzeugs im Belichtungsreiter deaktiviert.
TP_WAVELET_TMTYPE;Kompression
TP_WAVELET_TON;Tönung
TP_WBALANCE_AUTO;Automatisch
@@ -1870,15 +1942,15 @@ TP_WBALANCE_FLASH55;Leica
TP_WBALANCE_FLASH60;Standard, Canon, Pentax, Olympus
TP_WBALANCE_FLASH65;Nikon, Panasonic, Sony, Minolta
TP_WBALANCE_FLASH_HEADER;Blitz
-TP_WBALANCE_FLUO1;F1 - Daylight
-TP_WBALANCE_FLUO2;F2 - Cool White
-TP_WBALANCE_FLUO3;F3 - White
-TP_WBALANCE_FLUO4;F4 - Warm White
-TP_WBALANCE_FLUO5;F5 - Daylight
-TP_WBALANCE_FLUO6;F6 - Lite White
-TP_WBALANCE_FLUO7;F7 - D65 Daylight Simulator
+TP_WBALANCE_FLUO1;F1 - Tageslicht
+TP_WBALANCE_FLUO2;F2 - Kaltweiß
+TP_WBALANCE_FLUO3;F3 - Weiß
+TP_WBALANCE_FLUO4;F4 - Warmweiß
+TP_WBALANCE_FLUO5;F5 - Tageslicht
+TP_WBALANCE_FLUO6;F6 - Weiß reduziert
+TP_WBALANCE_FLUO7;F7 - D65 Tageslichtsimulation
TP_WBALANCE_FLUO8;F8 - D50 / Sylvania F40 Design
-TP_WBALANCE_FLUO9;F9 - Cool White Deluxe
+TP_WBALANCE_FLUO9;F9 - Kaltweiß Deluxe
TP_WBALANCE_FLUO10;F10 - Philips TL85
TP_WBALANCE_FLUO11;F11 - Philips TL84
TP_WBALANCE_FLUO12;F12 - Philips TL83
@@ -1913,77 +1985,3 @@ ZOOMPANEL_ZOOMFITSCREEN;An Bildschirm anpassen\nTaste: f
ZOOMPANEL_ZOOMIN;Hineinzoomen\nTaste: +
ZOOMPANEL_ZOOMOUT;Herauszoomen\nTaste: -
-!!!!!!!!!!!!!!!!!!!!!!!!!
-! Untranslated keys follow; remove the ! prefix after an entry is translated.
-!!!!!!!!!!!!!!!!!!!!!!!!!
-
-!HISTORY_MSG_407;Retinex - Method
-!HISTORY_MSG_408;Retinex - Neighboring
-!HISTORY_MSG_409;Retinex - Gain
-!HISTORY_MSG_410;Retinex - Offset
-!HISTORY_MSG_411;Retinex - Strength
-!HISTORY_MSG_412;Retinex - Scales
-!HISTORY_MSG_413;Retinex - Variance
-!HISTORY_MSG_414;Retinex - Histogram - Lab
-!HISTORY_MSG_415;Retinex - Transmission
-!HISTORY_MSG_416;Retinex
-!HISTORY_MSG_417;Retinex - Transmission median
-!HISTORY_MSG_418;Retinex - Threshold
-!HISTORY_MSG_419;Retinex - Color space
-!HISTORY_MSG_420;Retinex - Histogram - HSL
-!HISTORY_MSG_421;Retinex - Gamma
-!HISTORY_MSG_422;Retinex - Gamma
-!HISTORY_MSG_423;Retinex - Gamma slope
-!HISTORY_MSG_424;Retinex - HL threshold
-!HISTORY_MSG_425;Retinex - Log base
-!HISTORY_MSG_426;Retinex - Hue equalizer
-!PARTIALPASTE_RETINEX;Retinex
-!TP_RETINEX_CONTEDIT_HSL;Histogram equalizer HSL
-!TP_RETINEX_CONTEDIT_LAB;Histogram equalizer L*a*b*
-!TP_RETINEX_CONTEDIT_LH;Hue equalizer
-!TP_RETINEX_CURVEEDITOR_CD;L=f(L)
-!TP_RETINEX_CURVEEDITOR_CD_TOOLTIP;Luminance according to luminance L=f(L)\nCorrect raw data to reduce halos and artifacts.
-!TP_RETINEX_CURVEEDITOR_LH;Strength=f(H)
-!TP_RETINEX_CURVEEDITOR_LH_TOOLTIP;Strength according to hue Strength=f(H)\nThis curve also acts on chroma when using the "Highlight" retinex method.
-!TP_RETINEX_GAIN;Gain
-!TP_RETINEX_GAIN_TOOLTIP;Acts on the transmission in combination with the offset. This is very different from the others settings. Used for black or white pixels, and to help balance the histogram.
-!TP_RETINEX_GAMMA;Free gamma
-!TP_RETINEX_GAMMA;Gamma
-!TP_RETINEX_GAMMA_FREE;Free
-!TP_RETINEX_GAMMA_HIGH;High
-!TP_RETINEX_GAMMA_LOW;Low
-!TP_RETINEX_GAMMA_MID;Middle
-!TP_RETINEX_GAMMA_NONE;None
-!TP_RETINEX_GAMMA_TOOLTIP;Restore tones by applying gamma before and after Retinex. Different from Retinex curves or others curves (Lab, Exposure, etc.).
-!TP_RETINEX_HIGHLIGHT;Highlight threshold
-!TP_RETINEX_HIGHLIGHT_TOOLTIP;Increase action of High algorithm.\nMay require you to re-adjust "Neighboring pixels" and to increase the "White-point correction" in the Raw tab -> Raw White Points tool.
-!TP_RETINEX_HIGHLIG;Highlight
-!TP_RETINEX_HIGH;High
-!TP_RETINEX_HSLSPACE_LIN;HSL-Linear
-!TP_RETINEX_HSLSPACE_LOG;HSL-Logarithmic
-!TP_RETINEX_LABEL;Retinex
-!TP_RETINEX_LABSPACE;L*a*b*
-!TP_RETINEX_LOW;Low
-!TP_RETINEX_MEDIAN;Transmission median filter
-!TP_RETINEX_METHOD;Method
-!TP_RETINEX_METHOD_TOOLTIP;Low = Reinforce low light,\nUniform = Equalize action,\nHigh = Reinforce high light,\nHighlight = Remove magenta in highlights.
-!TP_RETINEX_MLABEL;Restored haze-free Min=%1 Max=%2
-!TP_RETINEX_MLABEL_TOOLTIP;Should be near min=0 max=32768\nRestored image with no mixture.
-!TP_RETINEX_NEIGHBOR;Neighboring pixels
-!TP_RETINEX_NEUTRAL;Reset
-!TP_RETINEX_NEUTRAL_TIP;Reset all sliders and curves to their default values.
-!TP_RETINEX_OFFSET;Offset
-!TP_RETINEX_SETTINGS;Settings
-!TP_RETINEX_SLOPE;Free gamma slope
-!TP_RETINEX_STRENGTH;Strength
-!TP_RETINEX_THRESHOLD;Threshold
-!TP_RETINEX_THRESHOLD_TOOLTIP;Limits in/out.\nIn = image source,\nOut = image gauss.
-!TP_RETINEX_TLABEL2;TM Tm=%1 TM=%2
-!TP_RETINEX_TLABEL;TM Min=%1 Max=%2 Mean=%3 Sigma=%4
-!TP_RETINEX_TLABEL_TOOLTIP;Transmission map result.\nMin and Max are used by Variance.\nMean and Sigma\nTm=Min TM=Max of transmission map.
-!TP_RETINEX_TRANSMISSION;Transmission map
-!TP_RETINEX_TRANSMISSION_TOOLTIP;Transmission according to transmission.\nAbscissa: transmission from negative values (min), mean, and positives values (max).\nOrdinate: amplification or reduction.
-!TP_RETINEX_UNIFORM;Uniform
-!TP_RETINEX_VARIANCE;Variance
-!TP_RETINEX_VARIANCE_TOOLTIP;Low variance increase local contrast and saturation, but can lead to artifacts.
-!TP_WAVELET_CB_TOOLTIP;For strong values product color-toning by combining it or not with levels decomposition 'toning'\nFor low values you can change the white balance of the background (sky, ...) without changing that of the front plane, generally more contrasted
diff --git a/rtdata/languages/English (UK) b/rtdata/languages/English (UK)
index e30422f98..0f9be4429 100644
--- a/rtdata/languages/English (UK)
+++ b/rtdata/languages/English (UK)
@@ -1167,7 +1167,7 @@ TP_WBALANCE_EQBLUERED_TOOLTIP;Allows to deviate from the normal behaviour of "wh
!SAVEDLG_SUBSAMP_1;Best compression
!SAVEDLG_SUBSAMP_2;Balanced
!SAVEDLG_SUBSAMP_3;Best quality
-!SAVEDLG_SUBSAMP_TOOLTIP;Best compression: 4:1:1\nBalanced: 4:2:2\nBest quality: 4:4:4
+!SAVEDLG_SUBSAMP_TOOLTIP;Best compression:\nJ:a:b 4:2:0\nh/v 2/2\nChroma halved horizontally and vertically.\n\nBalanced:\nJ:a:b 4:2:2\nh/v 2/1\nChroma halved horizontally.\n\nBest quality:\nJ:a:b 4:4:4\nh/v 1/1\nNo chroma subsampling.
!SAVEDLG_TIFFUNCOMPRESSED;Uncompressed TIFF
!SAVEDLG_WARNFILENAME;File will be named
!SHCSELECTOR_TOOLTIP;Click right mouse button to reset the position of those 3 sliders.
@@ -1648,9 +1648,9 @@ TP_WBALANCE_EQBLUERED_TOOLTIP;Allows to deviate from the normal behaviour of "wh
!TP_RETINEX_CURVEEDITOR_CD_TOOLTIP;Luminance according to luminance L=f(L)\nCorrect raw data to reduce halos and artifacts.
!TP_RETINEX_CURVEEDITOR_LH;Strength=f(H)
!TP_RETINEX_CURVEEDITOR_LH_TOOLTIP;Strength according to hue Strength=f(H)\nThis curve also acts on chroma when using the "Highlight" retinex method.
+!TP_RETINEX_FREEGAMMA;Free gamma
!TP_RETINEX_GAIN;Gain
-!TP_RETINEX_GAIN_TOOLTIP;Acts on the transmission in combination with the offset. This is very different from the others settings. Used for black or white pixels, and to help balance the histogram.
-!TP_RETINEX_GAMMA;Free gamma
+!TP_RETINEX_GAIN_TOOLTIP;Acts on the restored image.\n\nThis is very different from the others settings. Used for black or white pixels, and to help balance the histogram.
!TP_RETINEX_GAMMA;Gamma
!TP_RETINEX_GAMMA_FREE;Free
!TP_RETINEX_GAMMA_HIGH;High
@@ -1669,7 +1669,7 @@ TP_WBALANCE_EQBLUERED_TOOLTIP;Allows to deviate from the normal behaviour of "wh
!TP_RETINEX_LOW;Low
!TP_RETINEX_MEDIAN;Transmission median filter
!TP_RETINEX_METHOD;Method
-!TP_RETINEX_METHOD_TOOLTIP;Low = Reinforce low light,\nUniform = Equalize action,\nHigh = Reinforce high light,\nHighlight = Remove magenta in highlights.
+!TP_RETINEX_METHOD_TOOLTIP;Low = Reinforce low light,\nUniform = Equalize action,\nHigh = Reinforce high light,\nHighlights = Remove magenta in highlights.
!TP_RETINEX_MLABEL;Restored haze-free Min=%1 Max=%2
!TP_RETINEX_MLABEL_TOOLTIP;Should be near min=0 max=32768\nRestored image with no mixture.
!TP_RETINEX_NEIGHBOR;Neighboring pixels
diff --git a/rtdata/languages/English (US) b/rtdata/languages/English (US)
index 9edc36113..8cdb795df 100644
--- a/rtdata/languages/English (US)
+++ b/rtdata/languages/English (US)
@@ -1107,7 +1107,7 @@
!SAVEDLG_SUBSAMP_1;Best compression
!SAVEDLG_SUBSAMP_2;Balanced
!SAVEDLG_SUBSAMP_3;Best quality
-!SAVEDLG_SUBSAMP_TOOLTIP;Best compression: 4:1:1\nBalanced: 4:2:2\nBest quality: 4:4:4
+!SAVEDLG_SUBSAMP_TOOLTIP;Best compression:\nJ:a:b 4:2:0\nh/v 2/2\nChroma halved horizontally and vertically.\n\nBalanced:\nJ:a:b 4:2:2\nh/v 2/1\nChroma halved horizontally.\n\nBest quality:\nJ:a:b 4:4:4\nh/v 1/1\nNo chroma subsampling.
!SAVEDLG_TIFFUNCOMPRESSED;Uncompressed TIFF
!SAVEDLG_WARNFILENAME;File will be named
!SHCSELECTOR_TOOLTIP;Click right mouse button to reset the position of those 3 sliders.
@@ -1638,9 +1638,9 @@
!TP_RETINEX_CURVEEDITOR_CD_TOOLTIP;Luminance according to luminance L=f(L)\nCorrect raw data to reduce halos and artifacts.
!TP_RETINEX_CURVEEDITOR_LH;Strength=f(H)
!TP_RETINEX_CURVEEDITOR_LH_TOOLTIP;Strength according to hue Strength=f(H)\nThis curve also acts on chroma when using the "Highlight" retinex method.
+!TP_RETINEX_FREEGAMMA;Free gamma
!TP_RETINEX_GAIN;Gain
-!TP_RETINEX_GAIN_TOOLTIP;Acts on the transmission in combination with the offset. This is very different from the others settings. Used for black or white pixels, and to help balance the histogram.
-!TP_RETINEX_GAMMA;Free gamma
+!TP_RETINEX_GAIN_TOOLTIP;Acts on the restored image.\n\nThis is very different from the others settings. Used for black or white pixels, and to help balance the histogram.
!TP_RETINEX_GAMMA;Gamma
!TP_RETINEX_GAMMA_FREE;Free
!TP_RETINEX_GAMMA_HIGH;High
@@ -1659,7 +1659,7 @@
!TP_RETINEX_LOW;Low
!TP_RETINEX_MEDIAN;Transmission median filter
!TP_RETINEX_METHOD;Method
-!TP_RETINEX_METHOD_TOOLTIP;Low = Reinforce low light,\nUniform = Equalize action,\nHigh = Reinforce high light,\nHighlight = Remove magenta in highlights.
+!TP_RETINEX_METHOD_TOOLTIP;Low = Reinforce low light,\nUniform = Equalize action,\nHigh = Reinforce high light,\nHighlights = Remove magenta in highlights.
!TP_RETINEX_MLABEL;Restored haze-free Min=%1 Max=%2
!TP_RETINEX_MLABEL_TOOLTIP;Should be near min=0 max=32768\nRestored image with no mixture.
!TP_RETINEX_NEIGHBOR;Neighboring pixels
diff --git a/rtdata/languages/Espanol b/rtdata/languages/Espanol
index a8777b87e..2de0b3d64 100644
--- a/rtdata/languages/Espanol
+++ b/rtdata/languages/Espanol
@@ -953,7 +953,6 @@ SAVEDLG_SUBSAMP;Submuestreo
SAVEDLG_SUBSAMP_1;Máxima compresión
SAVEDLG_SUBSAMP_2;Balanceado
SAVEDLG_SUBSAMP_3;Máxima calidad
-SAVEDLG_SUBSAMP_TOOLTIP;Máxima compresión: 4:1:1\nBalanceado: 4:2:2\nMáxima calidad: 4:4:4
SAVEDLG_TIFFUNCOMPRESSED;TIFF sin compresión
SAVEDLG_WARNFILENAME;Se asignará nombre al archivo
SHCSELECTOR_TOOLTIP;Pulsar el botón derecho del ratón para restablecer la posición de los tres controles deslizantes
@@ -1769,6 +1768,7 @@ ZOOMPANEL_ZOOMOUT;Reducir Zoom\nAtajo: -
!PREFERENCES_WLONE;One level
!PREFERENCES_WLTWO;Two levels
!PREFERENCES_WLZER;No
+!SAVEDLG_SUBSAMP_TOOLTIP;Best compression:\nJ:a:b 4:2:0\nh/v 2/2\nChroma halved horizontally and vertically.\n\nBalanced:\nJ:a:b 4:2:2\nh/v 2/1\nChroma halved horizontally.\n\nBest quality:\nJ:a:b 4:4:4\nh/v 1/1\nNo chroma subsampling.
!TP_CROP_GTHARMMEANS;Harmonic Means
!TP_CROP_GTTRIANGLE1;Golden Triangles 1
!TP_CROP_GTTRIANGLE2;Golden Triangles 2
@@ -1822,9 +1822,9 @@ ZOOMPANEL_ZOOMOUT;Reducir Zoom\nAtajo: -
!TP_RETINEX_CURVEEDITOR_CD_TOOLTIP;Luminance according to luminance L=f(L)\nCorrect raw data to reduce halos and artifacts.
!TP_RETINEX_CURVEEDITOR_LH;Strength=f(H)
!TP_RETINEX_CURVEEDITOR_LH_TOOLTIP;Strength according to hue Strength=f(H)\nThis curve also acts on chroma when using the "Highlight" retinex method.
+!TP_RETINEX_FREEGAMMA;Free gamma
!TP_RETINEX_GAIN;Gain
-!TP_RETINEX_GAIN_TOOLTIP;Acts on the transmission in combination with the offset. This is very different from the others settings. Used for black or white pixels, and to help balance the histogram.
-!TP_RETINEX_GAMMA;Free gamma
+!TP_RETINEX_GAIN_TOOLTIP;Acts on the restored image.\n\nThis is very different from the others settings. Used for black or white pixels, and to help balance the histogram.
!TP_RETINEX_GAMMA;Gamma
!TP_RETINEX_GAMMA_FREE;Free
!TP_RETINEX_GAMMA_HIGH;High
@@ -1843,7 +1843,7 @@ ZOOMPANEL_ZOOMOUT;Reducir Zoom\nAtajo: -
!TP_RETINEX_LOW;Low
!TP_RETINEX_MEDIAN;Transmission median filter
!TP_RETINEX_METHOD;Method
-!TP_RETINEX_METHOD_TOOLTIP;Low = Reinforce low light,\nUniform = Equalize action,\nHigh = Reinforce high light,\nHighlight = Remove magenta in highlights.
+!TP_RETINEX_METHOD_TOOLTIP;Low = Reinforce low light,\nUniform = Equalize action,\nHigh = Reinforce high light,\nHighlights = Remove magenta in highlights.
!TP_RETINEX_MLABEL;Restored haze-free Min=%1 Max=%2
!TP_RETINEX_MLABEL_TOOLTIP;Should be near min=0 max=32768\nRestored image with no mixture.
!TP_RETINEX_NEIGHBOR;Neighboring pixels
diff --git a/rtdata/languages/Euskara b/rtdata/languages/Euskara
index bc4f034f8..5dc0e5726 100644
--- a/rtdata/languages/Euskara
+++ b/rtdata/languages/Euskara
@@ -1211,7 +1211,7 @@ TP_WBALANCE_TEMPERATURE;Tenperatura
!SAVEDLG_SUBSAMP_1;Best compression
!SAVEDLG_SUBSAMP_2;Balanced
!SAVEDLG_SUBSAMP_3;Best quality
-!SAVEDLG_SUBSAMP_TOOLTIP;Best compression: 4:1:1\nBalanced: 4:2:2\nBest quality: 4:4:4
+!SAVEDLG_SUBSAMP_TOOLTIP;Best compression:\nJ:a:b 4:2:0\nh/v 2/2\nChroma halved horizontally and vertically.\n\nBalanced:\nJ:a:b 4:2:2\nh/v 2/1\nChroma halved horizontally.\n\nBest quality:\nJ:a:b 4:4:4\nh/v 1/1\nNo chroma subsampling.
!SAVEDLG_TIFFUNCOMPRESSED;Uncompressed TIFF
!SAVEDLG_WARNFILENAME;File will be named
!SHCSELECTOR_TOOLTIP;Click right mouse button to reset the position of those 3 sliders.
@@ -1682,9 +1682,9 @@ TP_WBALANCE_TEMPERATURE;Tenperatura
!TP_RETINEX_CURVEEDITOR_CD_TOOLTIP;Luminance according to luminance L=f(L)\nCorrect raw data to reduce halos and artifacts.
!TP_RETINEX_CURVEEDITOR_LH;Strength=f(H)
!TP_RETINEX_CURVEEDITOR_LH_TOOLTIP;Strength according to hue Strength=f(H)\nThis curve also acts on chroma when using the "Highlight" retinex method.
+!TP_RETINEX_FREEGAMMA;Free gamma
!TP_RETINEX_GAIN;Gain
-!TP_RETINEX_GAIN_TOOLTIP;Acts on the transmission in combination with the offset. This is very different from the others settings. Used for black or white pixels, and to help balance the histogram.
-!TP_RETINEX_GAMMA;Free gamma
+!TP_RETINEX_GAIN_TOOLTIP;Acts on the restored image.\n\nThis is very different from the others settings. Used for black or white pixels, and to help balance the histogram.
!TP_RETINEX_GAMMA;Gamma
!TP_RETINEX_GAMMA_FREE;Free
!TP_RETINEX_GAMMA_HIGH;High
@@ -1703,7 +1703,7 @@ TP_WBALANCE_TEMPERATURE;Tenperatura
!TP_RETINEX_LOW;Low
!TP_RETINEX_MEDIAN;Transmission median filter
!TP_RETINEX_METHOD;Method
-!TP_RETINEX_METHOD_TOOLTIP;Low = Reinforce low light,\nUniform = Equalize action,\nHigh = Reinforce high light,\nHighlight = Remove magenta in highlights.
+!TP_RETINEX_METHOD_TOOLTIP;Low = Reinforce low light,\nUniform = Equalize action,\nHigh = Reinforce high light,\nHighlights = Remove magenta in highlights.
!TP_RETINEX_MLABEL;Restored haze-free Min=%1 Max=%2
!TP_RETINEX_MLABEL_TOOLTIP;Should be near min=0 max=32768\nRestored image with no mixture.
!TP_RETINEX_NEIGHBOR;Neighboring pixels
diff --git a/rtdata/languages/Francais b/rtdata/languages/Francais
index e49957537..808e96ecc 100644
--- a/rtdata/languages/Francais
+++ b/rtdata/languages/Francais
@@ -1084,7 +1084,6 @@ SAVEDLG_SUBSAMP;Sous-échantillonnage
SAVEDLG_SUBSAMP_1;Meilleure compression
SAVEDLG_SUBSAMP_2;Équilibré
SAVEDLG_SUBSAMP_3;Meilleure qualité
-SAVEDLG_SUBSAMP_TOOLTIP;Compression: 4:1:1\nÉquilibré: 4:2:2\nQualité: 4:4:4
SAVEDLG_TIFFUNCOMPRESSED;TIFF non compressé
SAVEDLG_WARNFILENAME;Le fichier sera nommé
SHCSELECTOR_TOOLTIP;Cliquez le bouton droit de la souris\npour réinitialiser la position de ces 3 curseurs
@@ -1918,6 +1917,7 @@ ZOOMPANEL_ZOOMOUT;Zoom Arrière\nRaccourci: -
!HISTORY_MSG_425;Retinex - Log base
!HISTORY_MSG_426;Retinex - Hue equalizer
!PARTIALPASTE_RETINEX;Retinex
+!SAVEDLG_SUBSAMP_TOOLTIP;Best compression:\nJ:a:b 4:2:0\nh/v 2/2\nChroma halved horizontally and vertically.\n\nBalanced:\nJ:a:b 4:2:2\nh/v 2/1\nChroma halved horizontally.\n\nBest quality:\nJ:a:b 4:4:4\nh/v 1/1\nNo chroma subsampling.
!TP_RETINEX_CONTEDIT_HSL;Histogram equalizer HSL
!TP_RETINEX_CONTEDIT_LAB;Histogram equalizer L*a*b*
!TP_RETINEX_CONTEDIT_LH;Hue equalizer
@@ -1925,9 +1925,9 @@ ZOOMPANEL_ZOOMOUT;Zoom Arrière\nRaccourci: -
!TP_RETINEX_CURVEEDITOR_CD_TOOLTIP;Luminance according to luminance L=f(L)\nCorrect raw data to reduce halos and artifacts.
!TP_RETINEX_CURVEEDITOR_LH;Strength=f(H)
!TP_RETINEX_CURVEEDITOR_LH_TOOLTIP;Strength according to hue Strength=f(H)\nThis curve also acts on chroma when using the "Highlight" retinex method.
+!TP_RETINEX_FREEGAMMA;Free gamma
!TP_RETINEX_GAIN;Gain
-!TP_RETINEX_GAIN_TOOLTIP;Acts on the transmission in combination with the offset. This is very different from the others settings. Used for black or white pixels, and to help balance the histogram.
-!TP_RETINEX_GAMMA;Free gamma
+!TP_RETINEX_GAIN_TOOLTIP;Acts on the restored image.\n\nThis is very different from the others settings. Used for black or white pixels, and to help balance the histogram.
!TP_RETINEX_GAMMA;Gamma
!TP_RETINEX_GAMMA_FREE;Free
!TP_RETINEX_GAMMA_HIGH;High
@@ -1946,7 +1946,7 @@ ZOOMPANEL_ZOOMOUT;Zoom Arrière\nRaccourci: -
!TP_RETINEX_LOW;Low
!TP_RETINEX_MEDIAN;Transmission median filter
!TP_RETINEX_METHOD;Method
-!TP_RETINEX_METHOD_TOOLTIP;Low = Reinforce low light,\nUniform = Equalize action,\nHigh = Reinforce high light,\nHighlight = Remove magenta in highlights.
+!TP_RETINEX_METHOD_TOOLTIP;Low = Reinforce low light,\nUniform = Equalize action,\nHigh = Reinforce high light,\nHighlights = Remove magenta in highlights.
!TP_RETINEX_MLABEL;Restored haze-free Min=%1 Max=%2
!TP_RETINEX_MLABEL_TOOLTIP;Should be near min=0 max=32768\nRestored image with no mixture.
!TP_RETINEX_NEIGHBOR;Neighboring pixels
diff --git a/rtdata/languages/Greek b/rtdata/languages/Greek
index a02384e50..d5191206a 100644
--- a/rtdata/languages/Greek
+++ b/rtdata/languages/Greek
@@ -1210,7 +1210,7 @@ TP_WBALANCE_TEMPERATURE;Θερμοκρασία
!SAVEDLG_SUBSAMP_1;Best compression
!SAVEDLG_SUBSAMP_2;Balanced
!SAVEDLG_SUBSAMP_3;Best quality
-!SAVEDLG_SUBSAMP_TOOLTIP;Best compression: 4:1:1\nBalanced: 4:2:2\nBest quality: 4:4:4
+!SAVEDLG_SUBSAMP_TOOLTIP;Best compression:\nJ:a:b 4:2:0\nh/v 2/2\nChroma halved horizontally and vertically.\n\nBalanced:\nJ:a:b 4:2:2\nh/v 2/1\nChroma halved horizontally.\n\nBest quality:\nJ:a:b 4:4:4\nh/v 1/1\nNo chroma subsampling.
!SAVEDLG_TIFFUNCOMPRESSED;Uncompressed TIFF
!SAVEDLG_WARNFILENAME;File will be named
!SHCSELECTOR_TOOLTIP;Click right mouse button to reset the position of those 3 sliders.
@@ -1681,9 +1681,9 @@ TP_WBALANCE_TEMPERATURE;Θερμοκρασία
!TP_RETINEX_CURVEEDITOR_CD_TOOLTIP;Luminance according to luminance L=f(L)\nCorrect raw data to reduce halos and artifacts.
!TP_RETINEX_CURVEEDITOR_LH;Strength=f(H)
!TP_RETINEX_CURVEEDITOR_LH_TOOLTIP;Strength according to hue Strength=f(H)\nThis curve also acts on chroma when using the "Highlight" retinex method.
+!TP_RETINEX_FREEGAMMA;Free gamma
!TP_RETINEX_GAIN;Gain
-!TP_RETINEX_GAIN_TOOLTIP;Acts on the transmission in combination with the offset. This is very different from the others settings. Used for black or white pixels, and to help balance the histogram.
-!TP_RETINEX_GAMMA;Free gamma
+!TP_RETINEX_GAIN_TOOLTIP;Acts on the restored image.\n\nThis is very different from the others settings. Used for black or white pixels, and to help balance the histogram.
!TP_RETINEX_GAMMA;Gamma
!TP_RETINEX_GAMMA_FREE;Free
!TP_RETINEX_GAMMA_HIGH;High
@@ -1702,7 +1702,7 @@ TP_WBALANCE_TEMPERATURE;Θερμοκρασία
!TP_RETINEX_LOW;Low
!TP_RETINEX_MEDIAN;Transmission median filter
!TP_RETINEX_METHOD;Method
-!TP_RETINEX_METHOD_TOOLTIP;Low = Reinforce low light,\nUniform = Equalize action,\nHigh = Reinforce high light,\nHighlight = Remove magenta in highlights.
+!TP_RETINEX_METHOD_TOOLTIP;Low = Reinforce low light,\nUniform = Equalize action,\nHigh = Reinforce high light,\nHighlights = Remove magenta in highlights.
!TP_RETINEX_MLABEL;Restored haze-free Min=%1 Max=%2
!TP_RETINEX_MLABEL_TOOLTIP;Should be near min=0 max=32768\nRestored image with no mixture.
!TP_RETINEX_NEIGHBOR;Neighboring pixels
diff --git a/rtdata/languages/Hebrew b/rtdata/languages/Hebrew
index 4d17da309..e3f195c9d 100644
--- a/rtdata/languages/Hebrew
+++ b/rtdata/languages/Hebrew
@@ -1211,7 +1211,7 @@ TP_WBALANCE_TEMPERATURE;מידת חום
!SAVEDLG_SUBSAMP_1;Best compression
!SAVEDLG_SUBSAMP_2;Balanced
!SAVEDLG_SUBSAMP_3;Best quality
-!SAVEDLG_SUBSAMP_TOOLTIP;Best compression: 4:1:1\nBalanced: 4:2:2\nBest quality: 4:4:4
+!SAVEDLG_SUBSAMP_TOOLTIP;Best compression:\nJ:a:b 4:2:0\nh/v 2/2\nChroma halved horizontally and vertically.\n\nBalanced:\nJ:a:b 4:2:2\nh/v 2/1\nChroma halved horizontally.\n\nBest quality:\nJ:a:b 4:4:4\nh/v 1/1\nNo chroma subsampling.
!SAVEDLG_TIFFUNCOMPRESSED;Uncompressed TIFF
!SAVEDLG_WARNFILENAME;File will be named
!SHCSELECTOR_TOOLTIP;Click right mouse button to reset the position of those 3 sliders.
@@ -1682,9 +1682,9 @@ TP_WBALANCE_TEMPERATURE;מידת חום
!TP_RETINEX_CURVEEDITOR_CD_TOOLTIP;Luminance according to luminance L=f(L)\nCorrect raw data to reduce halos and artifacts.
!TP_RETINEX_CURVEEDITOR_LH;Strength=f(H)
!TP_RETINEX_CURVEEDITOR_LH_TOOLTIP;Strength according to hue Strength=f(H)\nThis curve also acts on chroma when using the "Highlight" retinex method.
+!TP_RETINEX_FREEGAMMA;Free gamma
!TP_RETINEX_GAIN;Gain
-!TP_RETINEX_GAIN_TOOLTIP;Acts on the transmission in combination with the offset. This is very different from the others settings. Used for black or white pixels, and to help balance the histogram.
-!TP_RETINEX_GAMMA;Free gamma
+!TP_RETINEX_GAIN_TOOLTIP;Acts on the restored image.\n\nThis is very different from the others settings. Used for black or white pixels, and to help balance the histogram.
!TP_RETINEX_GAMMA;Gamma
!TP_RETINEX_GAMMA_FREE;Free
!TP_RETINEX_GAMMA_HIGH;High
@@ -1703,7 +1703,7 @@ TP_WBALANCE_TEMPERATURE;מידת חום
!TP_RETINEX_LOW;Low
!TP_RETINEX_MEDIAN;Transmission median filter
!TP_RETINEX_METHOD;Method
-!TP_RETINEX_METHOD_TOOLTIP;Low = Reinforce low light,\nUniform = Equalize action,\nHigh = Reinforce high light,\nHighlight = Remove magenta in highlights.
+!TP_RETINEX_METHOD_TOOLTIP;Low = Reinforce low light,\nUniform = Equalize action,\nHigh = Reinforce high light,\nHighlights = Remove magenta in highlights.
!TP_RETINEX_MLABEL;Restored haze-free Min=%1 Max=%2
!TP_RETINEX_MLABEL_TOOLTIP;Should be near min=0 max=32768\nRestored image with no mixture.
!TP_RETINEX_NEIGHBOR;Neighboring pixels
diff --git a/rtdata/languages/Italiano b/rtdata/languages/Italiano
index 520011c11..a8089d0ae 100644
--- a/rtdata/languages/Italiano
+++ b/rtdata/languages/Italiano
@@ -854,7 +854,6 @@ SAVEDLG_SUBSAMP;Sottocampionamento
SAVEDLG_SUBSAMP_1;Migliore Compressione
SAVEDLG_SUBSAMP_2;Bilanciato
SAVEDLG_SUBSAMP_3;Migliore Qualità
-SAVEDLG_SUBSAMP_TOOLTIP;Migliore Compressione: 4:1:1\nBilanciato: 4:2:2\nMigliore Qualità: 4:4:4
SAVEDLG_TIFFUNCOMPRESSED;TIFF non compresso
SAVEDLG_WARNFILENAME;Il file verrà chiamato
SHCSELECTOR_TOOLTIP;Click destro per ripristinare la posizione di questi tre cursori.
@@ -1630,6 +1629,7 @@ ZOOMPANEL_ZOOMOUT;Rimpicciolisci.\nScorciatoia: -
!PREFERENCES_WLONE;One level
!PREFERENCES_WLTWO;Two levels
!PREFERENCES_WLZER;No
+!SAVEDLG_SUBSAMP_TOOLTIP;Best compression:\nJ:a:b 4:2:0\nh/v 2/2\nChroma halved horizontally and vertically.\n\nBalanced:\nJ:a:b 4:2:2\nh/v 2/1\nChroma halved horizontally.\n\nBest quality:\nJ:a:b 4:4:4\nh/v 1/1\nNo chroma subsampling.
!TP_COLORTONING_AB;o C/L
!TP_COLORTONING_AUTOSAT;Automatic
!TP_COLORTONING_BALANCE;Balance
@@ -1764,9 +1764,9 @@ ZOOMPANEL_ZOOMOUT;Rimpicciolisci.\nScorciatoia: -
!TP_RETINEX_CURVEEDITOR_CD_TOOLTIP;Luminance according to luminance L=f(L)\nCorrect raw data to reduce halos and artifacts.
!TP_RETINEX_CURVEEDITOR_LH;Strength=f(H)
!TP_RETINEX_CURVEEDITOR_LH_TOOLTIP;Strength according to hue Strength=f(H)\nThis curve also acts on chroma when using the "Highlight" retinex method.
+!TP_RETINEX_FREEGAMMA;Free gamma
!TP_RETINEX_GAIN;Gain
-!TP_RETINEX_GAIN_TOOLTIP;Acts on the transmission in combination with the offset. This is very different from the others settings. Used for black or white pixels, and to help balance the histogram.
-!TP_RETINEX_GAMMA;Free gamma
+!TP_RETINEX_GAIN_TOOLTIP;Acts on the restored image.\n\nThis is very different from the others settings. Used for black or white pixels, and to help balance the histogram.
!TP_RETINEX_GAMMA;Gamma
!TP_RETINEX_GAMMA_FREE;Free
!TP_RETINEX_GAMMA_HIGH;High
@@ -1785,7 +1785,7 @@ ZOOMPANEL_ZOOMOUT;Rimpicciolisci.\nScorciatoia: -
!TP_RETINEX_LOW;Low
!TP_RETINEX_MEDIAN;Transmission median filter
!TP_RETINEX_METHOD;Method
-!TP_RETINEX_METHOD_TOOLTIP;Low = Reinforce low light,\nUniform = Equalize action,\nHigh = Reinforce high light,\nHighlight = Remove magenta in highlights.
+!TP_RETINEX_METHOD_TOOLTIP;Low = Reinforce low light,\nUniform = Equalize action,\nHigh = Reinforce high light,\nHighlights = Remove magenta in highlights.
!TP_RETINEX_MLABEL;Restored haze-free Min=%1 Max=%2
!TP_RETINEX_MLABEL_TOOLTIP;Should be near min=0 max=32768\nRestored image with no mixture.
!TP_RETINEX_NEIGHBOR;Neighboring pixels
diff --git a/rtdata/languages/Japanese b/rtdata/languages/Japanese
index 55a737344..a50e18a18 100644
--- a/rtdata/languages/Japanese
+++ b/rtdata/languages/Japanese
@@ -1117,7 +1117,6 @@ SAVEDLG_SUBSAMP;サブ・サンプリング
SAVEDLG_SUBSAMP_1;高圧縮
SAVEDLG_SUBSAMP_2;バランス
SAVEDLG_SUBSAMP_3;高画質
-SAVEDLG_SUBSAMP_TOOLTIP;高圧縮: 4:1:1\nバランス: 4:2:2\n高画質: 4:4:4
SAVEDLG_TIFFUNCOMPRESSED;非圧縮 TIFF
SAVEDLG_WARNFILENAME;ファイルに名前が付けられます
SHCSELECTOR_TOOLTIP;この3つのスライダーの位置をリセットするには\nマウスの右ボタンをクリック
@@ -1950,6 +1949,7 @@ ZOOMPANEL_ZOOMOUT;ズームアウト\nショートカット: -
!HISTORY_MSG_425;Retinex - Log base
!HISTORY_MSG_426;Retinex - Hue equalizer
!PARTIALPASTE_RETINEX;Retinex
+!SAVEDLG_SUBSAMP_TOOLTIP;Best compression:\nJ:a:b 4:2:0\nh/v 2/2\nChroma halved horizontally and vertically.\n\nBalanced:\nJ:a:b 4:2:2\nh/v 2/1\nChroma halved horizontally.\n\nBest quality:\nJ:a:b 4:4:4\nh/v 1/1\nNo chroma subsampling.
!TP_RETINEX_CONTEDIT_HSL;Histogram equalizer HSL
!TP_RETINEX_CONTEDIT_LAB;Histogram equalizer L*a*b*
!TP_RETINEX_CONTEDIT_LH;Hue equalizer
@@ -1957,9 +1957,9 @@ ZOOMPANEL_ZOOMOUT;ズームアウト\nショートカット: -
!TP_RETINEX_CURVEEDITOR_CD_TOOLTIP;Luminance according to luminance L=f(L)\nCorrect raw data to reduce halos and artifacts.
!TP_RETINEX_CURVEEDITOR_LH;Strength=f(H)
!TP_RETINEX_CURVEEDITOR_LH_TOOLTIP;Strength according to hue Strength=f(H)\nThis curve also acts on chroma when using the "Highlight" retinex method.
+!TP_RETINEX_FREEGAMMA;Free gamma
!TP_RETINEX_GAIN;Gain
-!TP_RETINEX_GAIN_TOOLTIP;Acts on the transmission in combination with the offset. This is very different from the others settings. Used for black or white pixels, and to help balance the histogram.
-!TP_RETINEX_GAMMA;Free gamma
+!TP_RETINEX_GAIN_TOOLTIP;Acts on the restored image.\n\nThis is very different from the others settings. Used for black or white pixels, and to help balance the histogram.
!TP_RETINEX_GAMMA;Gamma
!TP_RETINEX_GAMMA_FREE;Free
!TP_RETINEX_GAMMA_HIGH;High
@@ -1978,7 +1978,7 @@ ZOOMPANEL_ZOOMOUT;ズームアウト\nショートカット: -
!TP_RETINEX_LOW;Low
!TP_RETINEX_MEDIAN;Transmission median filter
!TP_RETINEX_METHOD;Method
-!TP_RETINEX_METHOD_TOOLTIP;Low = Reinforce low light,\nUniform = Equalize action,\nHigh = Reinforce high light,\nHighlight = Remove magenta in highlights.
+!TP_RETINEX_METHOD_TOOLTIP;Low = Reinforce low light,\nUniform = Equalize action,\nHigh = Reinforce high light,\nHighlights = Remove magenta in highlights.
!TP_RETINEX_MLABEL;Restored haze-free Min=%1 Max=%2
!TP_RETINEX_MLABEL_TOOLTIP;Should be near min=0 max=32768\nRestored image with no mixture.
!TP_RETINEX_NEIGHBOR;Neighboring pixels
diff --git a/rtdata/languages/Latvian b/rtdata/languages/Latvian
index 67b4580ce..8a4daf3de 100644
--- a/rtdata/languages/Latvian
+++ b/rtdata/languages/Latvian
@@ -1211,7 +1211,7 @@ TP_WBALANCE_TEMPERATURE;Temperatūra
!SAVEDLG_SUBSAMP_1;Best compression
!SAVEDLG_SUBSAMP_2;Balanced
!SAVEDLG_SUBSAMP_3;Best quality
-!SAVEDLG_SUBSAMP_TOOLTIP;Best compression: 4:1:1\nBalanced: 4:2:2\nBest quality: 4:4:4
+!SAVEDLG_SUBSAMP_TOOLTIP;Best compression:\nJ:a:b 4:2:0\nh/v 2/2\nChroma halved horizontally and vertically.\n\nBalanced:\nJ:a:b 4:2:2\nh/v 2/1\nChroma halved horizontally.\n\nBest quality:\nJ:a:b 4:4:4\nh/v 1/1\nNo chroma subsampling.
!SAVEDLG_TIFFUNCOMPRESSED;Uncompressed TIFF
!SAVEDLG_WARNFILENAME;File will be named
!SHCSELECTOR_TOOLTIP;Click right mouse button to reset the position of those 3 sliders.
@@ -1682,9 +1682,9 @@ TP_WBALANCE_TEMPERATURE;Temperatūra
!TP_RETINEX_CURVEEDITOR_CD_TOOLTIP;Luminance according to luminance L=f(L)\nCorrect raw data to reduce halos and artifacts.
!TP_RETINEX_CURVEEDITOR_LH;Strength=f(H)
!TP_RETINEX_CURVEEDITOR_LH_TOOLTIP;Strength according to hue Strength=f(H)\nThis curve also acts on chroma when using the "Highlight" retinex method.
+!TP_RETINEX_FREEGAMMA;Free gamma
!TP_RETINEX_GAIN;Gain
-!TP_RETINEX_GAIN_TOOLTIP;Acts on the transmission in combination with the offset. This is very different from the others settings. Used for black or white pixels, and to help balance the histogram.
-!TP_RETINEX_GAMMA;Free gamma
+!TP_RETINEX_GAIN_TOOLTIP;Acts on the restored image.\n\nThis is very different from the others settings. Used for black or white pixels, and to help balance the histogram.
!TP_RETINEX_GAMMA;Gamma
!TP_RETINEX_GAMMA_FREE;Free
!TP_RETINEX_GAMMA_HIGH;High
@@ -1703,7 +1703,7 @@ TP_WBALANCE_TEMPERATURE;Temperatūra
!TP_RETINEX_LOW;Low
!TP_RETINEX_MEDIAN;Transmission median filter
!TP_RETINEX_METHOD;Method
-!TP_RETINEX_METHOD_TOOLTIP;Low = Reinforce low light,\nUniform = Equalize action,\nHigh = Reinforce high light,\nHighlight = Remove magenta in highlights.
+!TP_RETINEX_METHOD_TOOLTIP;Low = Reinforce low light,\nUniform = Equalize action,\nHigh = Reinforce high light,\nHighlights = Remove magenta in highlights.
!TP_RETINEX_MLABEL;Restored haze-free Min=%1 Max=%2
!TP_RETINEX_MLABEL_TOOLTIP;Should be near min=0 max=32768\nRestored image with no mixture.
!TP_RETINEX_NEIGHBOR;Neighboring pixels
diff --git a/rtdata/languages/Magyar b/rtdata/languages/Magyar
index d2073c56f..27e0875e9 100644
--- a/rtdata/languages/Magyar
+++ b/rtdata/languages/Magyar
@@ -1368,7 +1368,7 @@ ZOOMPANEL_ZOOMOUT;Kicsinyítés -
!SAVEDLG_SUBSAMP_1;Best compression
!SAVEDLG_SUBSAMP_2;Balanced
!SAVEDLG_SUBSAMP_3;Best quality
-!SAVEDLG_SUBSAMP_TOOLTIP;Best compression: 4:1:1\nBalanced: 4:2:2\nBest quality: 4:4:4
+!SAVEDLG_SUBSAMP_TOOLTIP;Best compression:\nJ:a:b 4:2:0\nh/v 2/2\nChroma halved horizontally and vertically.\n\nBalanced:\nJ:a:b 4:2:2\nh/v 2/1\nChroma halved horizontally.\n\nBest quality:\nJ:a:b 4:4:4\nh/v 1/1\nNo chroma subsampling.
!SAVEDLG_WARNFILENAME;File will be named
!SHCSELECTOR_TOOLTIP;Click right mouse button to reset the position of those 3 sliders.
!THRESHOLDSELECTOR_BL;Bottom-left
@@ -1743,9 +1743,9 @@ ZOOMPANEL_ZOOMOUT;Kicsinyítés -
!TP_RETINEX_CURVEEDITOR_CD_TOOLTIP;Luminance according to luminance L=f(L)\nCorrect raw data to reduce halos and artifacts.
!TP_RETINEX_CURVEEDITOR_LH;Strength=f(H)
!TP_RETINEX_CURVEEDITOR_LH_TOOLTIP;Strength according to hue Strength=f(H)\nThis curve also acts on chroma when using the "Highlight" retinex method.
+!TP_RETINEX_FREEGAMMA;Free gamma
!TP_RETINEX_GAIN;Gain
-!TP_RETINEX_GAIN_TOOLTIP;Acts on the transmission in combination with the offset. This is very different from the others settings. Used for black or white pixels, and to help balance the histogram.
-!TP_RETINEX_GAMMA;Free gamma
+!TP_RETINEX_GAIN_TOOLTIP;Acts on the restored image.\n\nThis is very different from the others settings. Used for black or white pixels, and to help balance the histogram.
!TP_RETINEX_GAMMA;Gamma
!TP_RETINEX_GAMMA_FREE;Free
!TP_RETINEX_GAMMA_HIGH;High
@@ -1764,7 +1764,7 @@ ZOOMPANEL_ZOOMOUT;Kicsinyítés -
!TP_RETINEX_LOW;Low
!TP_RETINEX_MEDIAN;Transmission median filter
!TP_RETINEX_METHOD;Method
-!TP_RETINEX_METHOD_TOOLTIP;Low = Reinforce low light,\nUniform = Equalize action,\nHigh = Reinforce high light,\nHighlight = Remove magenta in highlights.
+!TP_RETINEX_METHOD_TOOLTIP;Low = Reinforce low light,\nUniform = Equalize action,\nHigh = Reinforce high light,\nHighlights = Remove magenta in highlights.
!TP_RETINEX_MLABEL;Restored haze-free Min=%1 Max=%2
!TP_RETINEX_MLABEL_TOOLTIP;Should be near min=0 max=32768\nRestored image with no mixture.
!TP_RETINEX_NEIGHBOR;Neighboring pixels
diff --git a/rtdata/languages/Nederlands b/rtdata/languages/Nederlands
index 6d8204721..4b1118c9e 100644
--- a/rtdata/languages/Nederlands
+++ b/rtdata/languages/Nederlands
@@ -1001,7 +1001,6 @@ SAVEDLG_SUBSAMP;Subsampling
SAVEDLG_SUBSAMP_1;Beste compressie
SAVEDLG_SUBSAMP_2;Gebalanceerd
SAVEDLG_SUBSAMP_3;Beste kwaliteit
-SAVEDLG_SUBSAMP_TOOLTIP;Beste Compressie: 4:1:1\nGebalanceerd: 4:2:2\nBeste kwaliteit: 4:4:4
SAVEDLG_TIFFUNCOMPRESSED;Geen compressie
SAVEDLG_WARNFILENAME;Bestandsnaam wordt
SHCSELECTOR_TOOLTIP;Klik op de rechtermuisknop om\nde 3 knoppen te verschuiven
@@ -1824,6 +1823,7 @@ ZOOMPANEL_ZOOMOUT;Zoom uit\nSneltoets: -
!PREFERENCES_SERIALIZE_TIFF_READ;Tiff Read Settings
!PREFERENCES_SERIALIZE_TIFF_READ_LABEL;Serialize read of tiff files
!PREFERENCES_SERIALIZE_TIFF_READ_TOOLTIP;When working with folders full of uncompressed tiff files enabling this option can increase performance of thumb generation.
+!SAVEDLG_SUBSAMP_TOOLTIP;Best compression:\nJ:a:b 4:2:0\nh/v 2/2\nChroma halved horizontally and vertically.\n\nBalanced:\nJ:a:b 4:2:2\nh/v 2/1\nChroma halved horizontally.\n\nBest quality:\nJ:a:b 4:4:4\nh/v 1/1\nNo chroma subsampling.
!TP_CROP_GTHARMMEANS;Harmonic Means
!TP_CROP_GTTRIANGLE1;Golden Triangles 1
!TP_CROP_GTTRIANGLE2;Golden Triangles 2
@@ -1851,9 +1851,9 @@ ZOOMPANEL_ZOOMOUT;Zoom uit\nSneltoets: -
!TP_RETINEX_CURVEEDITOR_CD_TOOLTIP;Luminance according to luminance L=f(L)\nCorrect raw data to reduce halos and artifacts.
!TP_RETINEX_CURVEEDITOR_LH;Strength=f(H)
!TP_RETINEX_CURVEEDITOR_LH_TOOLTIP;Strength according to hue Strength=f(H)\nThis curve also acts on chroma when using the "Highlight" retinex method.
+!TP_RETINEX_FREEGAMMA;Free gamma
!TP_RETINEX_GAIN;Gain
-!TP_RETINEX_GAIN_TOOLTIP;Acts on the transmission in combination with the offset. This is very different from the others settings. Used for black or white pixels, and to help balance the histogram.
-!TP_RETINEX_GAMMA;Free gamma
+!TP_RETINEX_GAIN_TOOLTIP;Acts on the restored image.\n\nThis is very different from the others settings. Used for black or white pixels, and to help balance the histogram.
!TP_RETINEX_GAMMA;Gamma
!TP_RETINEX_GAMMA_FREE;Free
!TP_RETINEX_GAMMA_HIGH;High
@@ -1872,7 +1872,7 @@ ZOOMPANEL_ZOOMOUT;Zoom uit\nSneltoets: -
!TP_RETINEX_LOW;Low
!TP_RETINEX_MEDIAN;Transmission median filter
!TP_RETINEX_METHOD;Method
-!TP_RETINEX_METHOD_TOOLTIP;Low = Reinforce low light,\nUniform = Equalize action,\nHigh = Reinforce high light,\nHighlight = Remove magenta in highlights.
+!TP_RETINEX_METHOD_TOOLTIP;Low = Reinforce low light,\nUniform = Equalize action,\nHigh = Reinforce high light,\nHighlights = Remove magenta in highlights.
!TP_RETINEX_MLABEL;Restored haze-free Min=%1 Max=%2
!TP_RETINEX_MLABEL_TOOLTIP;Should be near min=0 max=32768\nRestored image with no mixture.
!TP_RETINEX_NEIGHBOR;Neighboring pixels
diff --git a/rtdata/languages/Norsk BM b/rtdata/languages/Norsk BM
index 028fb69ea..b189af996 100644
--- a/rtdata/languages/Norsk BM
+++ b/rtdata/languages/Norsk BM
@@ -1210,7 +1210,7 @@ TP_WBALANCE_TEMPERATURE;Temperatur
!SAVEDLG_SUBSAMP_1;Best compression
!SAVEDLG_SUBSAMP_2;Balanced
!SAVEDLG_SUBSAMP_3;Best quality
-!SAVEDLG_SUBSAMP_TOOLTIP;Best compression: 4:1:1\nBalanced: 4:2:2\nBest quality: 4:4:4
+!SAVEDLG_SUBSAMP_TOOLTIP;Best compression:\nJ:a:b 4:2:0\nh/v 2/2\nChroma halved horizontally and vertically.\n\nBalanced:\nJ:a:b 4:2:2\nh/v 2/1\nChroma halved horizontally.\n\nBest quality:\nJ:a:b 4:4:4\nh/v 1/1\nNo chroma subsampling.
!SAVEDLG_TIFFUNCOMPRESSED;Uncompressed TIFF
!SAVEDLG_WARNFILENAME;File will be named
!SHCSELECTOR_TOOLTIP;Click right mouse button to reset the position of those 3 sliders.
@@ -1681,9 +1681,9 @@ TP_WBALANCE_TEMPERATURE;Temperatur
!TP_RETINEX_CURVEEDITOR_CD_TOOLTIP;Luminance according to luminance L=f(L)\nCorrect raw data to reduce halos and artifacts.
!TP_RETINEX_CURVEEDITOR_LH;Strength=f(H)
!TP_RETINEX_CURVEEDITOR_LH_TOOLTIP;Strength according to hue Strength=f(H)\nThis curve also acts on chroma when using the "Highlight" retinex method.
+!TP_RETINEX_FREEGAMMA;Free gamma
!TP_RETINEX_GAIN;Gain
-!TP_RETINEX_GAIN_TOOLTIP;Acts on the transmission in combination with the offset. This is very different from the others settings. Used for black or white pixels, and to help balance the histogram.
-!TP_RETINEX_GAMMA;Free gamma
+!TP_RETINEX_GAIN_TOOLTIP;Acts on the restored image.\n\nThis is very different from the others settings. Used for black or white pixels, and to help balance the histogram.
!TP_RETINEX_GAMMA;Gamma
!TP_RETINEX_GAMMA_FREE;Free
!TP_RETINEX_GAMMA_HIGH;High
@@ -1702,7 +1702,7 @@ TP_WBALANCE_TEMPERATURE;Temperatur
!TP_RETINEX_LOW;Low
!TP_RETINEX_MEDIAN;Transmission median filter
!TP_RETINEX_METHOD;Method
-!TP_RETINEX_METHOD_TOOLTIP;Low = Reinforce low light,\nUniform = Equalize action,\nHigh = Reinforce high light,\nHighlight = Remove magenta in highlights.
+!TP_RETINEX_METHOD_TOOLTIP;Low = Reinforce low light,\nUniform = Equalize action,\nHigh = Reinforce high light,\nHighlights = Remove magenta in highlights.
!TP_RETINEX_MLABEL;Restored haze-free Min=%1 Max=%2
!TP_RETINEX_MLABEL_TOOLTIP;Should be near min=0 max=32768\nRestored image with no mixture.
!TP_RETINEX_NEIGHBOR;Neighboring pixels
diff --git a/rtdata/languages/Polish b/rtdata/languages/Polish
index 1657da6f2..79673a42e 100644
--- a/rtdata/languages/Polish
+++ b/rtdata/languages/Polish
@@ -908,7 +908,6 @@ SAVEDLG_SUBSAMP;Subsampling
SAVEDLG_SUBSAMP_1;Najlepsza kompresja
SAVEDLG_SUBSAMP_2;Pomiędzy
SAVEDLG_SUBSAMP_3;Najlepsza jakość
-SAVEDLG_SUBSAMP_TOOLTIP;Najlepsza kompresja: 4:1:1\nPomiędzy: 4:2:2\nNajlepsza jakość: 4:4:4
SAVEDLG_TIFFUNCOMPRESSED;Nieskompresowany TIFF
SAVEDLG_WARNFILENAME;Plik zostanie nazwany
SHCSELECTOR_TOOLTIP;Kliknij prawym przyciskiem myszki aby zresetować poycję trzech suwaków.
@@ -1715,6 +1714,7 @@ ZOOMPANEL_ZOOMOUT;Oddal\nSkrót: -
!PREFERENCES_WLONE;One level
!PREFERENCES_WLTWO;Two levels
!PREFERENCES_WLZER;No
+!SAVEDLG_SUBSAMP_TOOLTIP;Best compression:\nJ:a:b 4:2:0\nh/v 2/2\nChroma halved horizontally and vertically.\n\nBalanced:\nJ:a:b 4:2:2\nh/v 2/1\nChroma halved horizontally.\n\nBest quality:\nJ:a:b 4:4:4\nh/v 1/1\nNo chroma subsampling.
!TP_CROP_GTHARMMEANS;Harmonic Means
!TP_CROP_GTTRIANGLE1;Golden Triangles 1
!TP_CROP_GTTRIANGLE2;Golden Triangles 2
@@ -1768,9 +1768,9 @@ ZOOMPANEL_ZOOMOUT;Oddal\nSkrót: -
!TP_RETINEX_CURVEEDITOR_CD_TOOLTIP;Luminance according to luminance L=f(L)\nCorrect raw data to reduce halos and artifacts.
!TP_RETINEX_CURVEEDITOR_LH;Strength=f(H)
!TP_RETINEX_CURVEEDITOR_LH_TOOLTIP;Strength according to hue Strength=f(H)\nThis curve also acts on chroma when using the "Highlight" retinex method.
+!TP_RETINEX_FREEGAMMA;Free gamma
!TP_RETINEX_GAIN;Gain
-!TP_RETINEX_GAIN_TOOLTIP;Acts on the transmission in combination with the offset. This is very different from the others settings. Used for black or white pixels, and to help balance the histogram.
-!TP_RETINEX_GAMMA;Free gamma
+!TP_RETINEX_GAIN_TOOLTIP;Acts on the restored image.\n\nThis is very different from the others settings. Used for black or white pixels, and to help balance the histogram.
!TP_RETINEX_GAMMA;Gamma
!TP_RETINEX_GAMMA_FREE;Free
!TP_RETINEX_GAMMA_HIGH;High
@@ -1789,7 +1789,7 @@ ZOOMPANEL_ZOOMOUT;Oddal\nSkrót: -
!TP_RETINEX_LOW;Low
!TP_RETINEX_MEDIAN;Transmission median filter
!TP_RETINEX_METHOD;Method
-!TP_RETINEX_METHOD_TOOLTIP;Low = Reinforce low light,\nUniform = Equalize action,\nHigh = Reinforce high light,\nHighlight = Remove magenta in highlights.
+!TP_RETINEX_METHOD_TOOLTIP;Low = Reinforce low light,\nUniform = Equalize action,\nHigh = Reinforce high light,\nHighlights = Remove magenta in highlights.
!TP_RETINEX_MLABEL;Restored haze-free Min=%1 Max=%2
!TP_RETINEX_MLABEL_TOOLTIP;Should be near min=0 max=32768\nRestored image with no mixture.
!TP_RETINEX_NEIGHBOR;Neighboring pixels
diff --git a/rtdata/languages/Polish (Latin Characters) b/rtdata/languages/Polish (Latin Characters)
index 0381c2395..ed9baac5c 100644
--- a/rtdata/languages/Polish (Latin Characters)
+++ b/rtdata/languages/Polish (Latin Characters)
@@ -908,7 +908,6 @@ SAVEDLG_SUBSAMP;Subsampling
SAVEDLG_SUBSAMP_1;Najlepsza kompresja
SAVEDLG_SUBSAMP_2;Pomiedzy
SAVEDLG_SUBSAMP_3;Najlepsza jakosc
-SAVEDLG_SUBSAMP_TOOLTIP;Najlepsza kompresja: 4:1:1\nPomiedzy: 4:2:2\nNajlepsza jakosc: 4:4:4
SAVEDLG_TIFFUNCOMPRESSED;Nieskompresowany TIFF
SAVEDLG_WARNFILENAME;Plik zostanie nazwany
SHCSELECTOR_TOOLTIP;Kliknij prawym przyciskiem myszki aby zresetowac poycje trzech suwakow.
@@ -1715,6 +1714,7 @@ ZOOMPANEL_ZOOMOUT;Oddal\nSkrot: -
!PREFERENCES_WLONE;One level
!PREFERENCES_WLTWO;Two levels
!PREFERENCES_WLZER;No
+!SAVEDLG_SUBSAMP_TOOLTIP;Best compression:\nJ:a:b 4:2:0\nh/v 2/2\nChroma halved horizontally and vertically.\n\nBalanced:\nJ:a:b 4:2:2\nh/v 2/1\nChroma halved horizontally.\n\nBest quality:\nJ:a:b 4:4:4\nh/v 1/1\nNo chroma subsampling.
!TP_CROP_GTHARMMEANS;Harmonic Means
!TP_CROP_GTTRIANGLE1;Golden Triangles 1
!TP_CROP_GTTRIANGLE2;Golden Triangles 2
@@ -1768,9 +1768,9 @@ ZOOMPANEL_ZOOMOUT;Oddal\nSkrot: -
!TP_RETINEX_CURVEEDITOR_CD_TOOLTIP;Luminance according to luminance L=f(L)\nCorrect raw data to reduce halos and artifacts.
!TP_RETINEX_CURVEEDITOR_LH;Strength=f(H)
!TP_RETINEX_CURVEEDITOR_LH_TOOLTIP;Strength according to hue Strength=f(H)\nThis curve also acts on chroma when using the "Highlight" retinex method.
+!TP_RETINEX_FREEGAMMA;Free gamma
!TP_RETINEX_GAIN;Gain
-!TP_RETINEX_GAIN_TOOLTIP;Acts on the transmission in combination with the offset. This is very different from the others settings. Used for black or white pixels, and to help balance the histogram.
-!TP_RETINEX_GAMMA;Free gamma
+!TP_RETINEX_GAIN_TOOLTIP;Acts on the restored image.\n\nThis is very different from the others settings. Used for black or white pixels, and to help balance the histogram.
!TP_RETINEX_GAMMA;Gamma
!TP_RETINEX_GAMMA_FREE;Free
!TP_RETINEX_GAMMA_HIGH;High
@@ -1789,7 +1789,7 @@ ZOOMPANEL_ZOOMOUT;Oddal\nSkrot: -
!TP_RETINEX_LOW;Low
!TP_RETINEX_MEDIAN;Transmission median filter
!TP_RETINEX_METHOD;Method
-!TP_RETINEX_METHOD_TOOLTIP;Low = Reinforce low light,\nUniform = Equalize action,\nHigh = Reinforce high light,\nHighlight = Remove magenta in highlights.
+!TP_RETINEX_METHOD_TOOLTIP;Low = Reinforce low light,\nUniform = Equalize action,\nHigh = Reinforce high light,\nHighlights = Remove magenta in highlights.
!TP_RETINEX_MLABEL;Restored haze-free Min=%1 Max=%2
!TP_RETINEX_MLABEL_TOOLTIP;Should be near min=0 max=32768\nRestored image with no mixture.
!TP_RETINEX_NEIGHBOR;Neighboring pixels
diff --git a/rtdata/languages/Portugues (Brasil) b/rtdata/languages/Portugues (Brasil)
index 3bd28c81f..ef4eb01ce 100644
--- a/rtdata/languages/Portugues (Brasil)
+++ b/rtdata/languages/Portugues (Brasil)
@@ -1211,7 +1211,7 @@ TP_WBALANCE_TEMPERATURE;Temperatura
!SAVEDLG_SUBSAMP_1;Best compression
!SAVEDLG_SUBSAMP_2;Balanced
!SAVEDLG_SUBSAMP_3;Best quality
-!SAVEDLG_SUBSAMP_TOOLTIP;Best compression: 4:1:1\nBalanced: 4:2:2\nBest quality: 4:4:4
+!SAVEDLG_SUBSAMP_TOOLTIP;Best compression:\nJ:a:b 4:2:0\nh/v 2/2\nChroma halved horizontally and vertically.\n\nBalanced:\nJ:a:b 4:2:2\nh/v 2/1\nChroma halved horizontally.\n\nBest quality:\nJ:a:b 4:4:4\nh/v 1/1\nNo chroma subsampling.
!SAVEDLG_TIFFUNCOMPRESSED;Uncompressed TIFF
!SAVEDLG_WARNFILENAME;File will be named
!SHCSELECTOR_TOOLTIP;Click right mouse button to reset the position of those 3 sliders.
@@ -1682,9 +1682,9 @@ TP_WBALANCE_TEMPERATURE;Temperatura
!TP_RETINEX_CURVEEDITOR_CD_TOOLTIP;Luminance according to luminance L=f(L)\nCorrect raw data to reduce halos and artifacts.
!TP_RETINEX_CURVEEDITOR_LH;Strength=f(H)
!TP_RETINEX_CURVEEDITOR_LH_TOOLTIP;Strength according to hue Strength=f(H)\nThis curve also acts on chroma when using the "Highlight" retinex method.
+!TP_RETINEX_FREEGAMMA;Free gamma
!TP_RETINEX_GAIN;Gain
-!TP_RETINEX_GAIN_TOOLTIP;Acts on the transmission in combination with the offset. This is very different from the others settings. Used for black or white pixels, and to help balance the histogram.
-!TP_RETINEX_GAMMA;Free gamma
+!TP_RETINEX_GAIN_TOOLTIP;Acts on the restored image.\n\nThis is very different from the others settings. Used for black or white pixels, and to help balance the histogram.
!TP_RETINEX_GAMMA;Gamma
!TP_RETINEX_GAMMA_FREE;Free
!TP_RETINEX_GAMMA_HIGH;High
@@ -1703,7 +1703,7 @@ TP_WBALANCE_TEMPERATURE;Temperatura
!TP_RETINEX_LOW;Low
!TP_RETINEX_MEDIAN;Transmission median filter
!TP_RETINEX_METHOD;Method
-!TP_RETINEX_METHOD_TOOLTIP;Low = Reinforce low light,\nUniform = Equalize action,\nHigh = Reinforce high light,\nHighlight = Remove magenta in highlights.
+!TP_RETINEX_METHOD_TOOLTIP;Low = Reinforce low light,\nUniform = Equalize action,\nHigh = Reinforce high light,\nHighlights = Remove magenta in highlights.
!TP_RETINEX_MLABEL;Restored haze-free Min=%1 Max=%2
!TP_RETINEX_MLABEL_TOOLTIP;Should be near min=0 max=32768\nRestored image with no mixture.
!TP_RETINEX_NEIGHBOR;Neighboring pixels
diff --git a/rtdata/languages/Russian b/rtdata/languages/Russian
index 465e9c781..93148ac36 100644
--- a/rtdata/languages/Russian
+++ b/rtdata/languages/Russian
@@ -835,7 +835,6 @@ SAVEDLG_SUBSAMP;Субдискретизация
SAVEDLG_SUBSAMP_1;Лучшая компрессия
SAVEDLG_SUBSAMP_2;Сбалансированно
SAVEDLG_SUBSAMP_3;Лучшее качество
-SAVEDLG_SUBSAMP_TOOLTIP;Лучшая компрессия: 4:1:1\nСбалансированно: 4:2:2\nЛучшее качество: 4:4:4
SAVEDLG_TIFFUNCOMPRESSED;Несжатый TIFF
SAVEDLG_WARNFILENAME;Файл будет назван
SHCSELECTOR_TOOLTIP;Нажмите правую кнопку мыши для сброса позиции этих трех ползунков.
@@ -1587,6 +1586,7 @@ ZOOMPANEL_ZOOMOUT;Удалить -
!PREFERENCES_WLONE;One level
!PREFERENCES_WLTWO;Two levels
!PREFERENCES_WLZER;No
+!SAVEDLG_SUBSAMP_TOOLTIP;Best compression:\nJ:a:b 4:2:0\nh/v 2/2\nChroma halved horizontally and vertically.\n\nBalanced:\nJ:a:b 4:2:2\nh/v 2/1\nChroma halved horizontally.\n\nBest quality:\nJ:a:b 4:4:4\nh/v 1/1\nNo chroma subsampling.
!TP_BWMIX_SET_RGBABS;Absolute RGB
!TP_BWMIX_SET_RGBREL;Relative RGB
!TP_BWMIX_SET_ROYGCBPMABS;Absolute ROYGCBPM
@@ -1766,9 +1766,9 @@ ZOOMPANEL_ZOOMOUT;Удалить -
!TP_RETINEX_CURVEEDITOR_CD_TOOLTIP;Luminance according to luminance L=f(L)\nCorrect raw data to reduce halos and artifacts.
!TP_RETINEX_CURVEEDITOR_LH;Strength=f(H)
!TP_RETINEX_CURVEEDITOR_LH_TOOLTIP;Strength according to hue Strength=f(H)\nThis curve also acts on chroma when using the "Highlight" retinex method.
+!TP_RETINEX_FREEGAMMA;Free gamma
!TP_RETINEX_GAIN;Gain
-!TP_RETINEX_GAIN_TOOLTIP;Acts on the transmission in combination with the offset. This is very different from the others settings. Used for black or white pixels, and to help balance the histogram.
-!TP_RETINEX_GAMMA;Free gamma
+!TP_RETINEX_GAIN_TOOLTIP;Acts on the restored image.\n\nThis is very different from the others settings. Used for black or white pixels, and to help balance the histogram.
!TP_RETINEX_GAMMA;Gamma
!TP_RETINEX_GAMMA_FREE;Free
!TP_RETINEX_GAMMA_HIGH;High
@@ -1787,7 +1787,7 @@ ZOOMPANEL_ZOOMOUT;Удалить -
!TP_RETINEX_LOW;Low
!TP_RETINEX_MEDIAN;Transmission median filter
!TP_RETINEX_METHOD;Method
-!TP_RETINEX_METHOD_TOOLTIP;Low = Reinforce low light,\nUniform = Equalize action,\nHigh = Reinforce high light,\nHighlight = Remove magenta in highlights.
+!TP_RETINEX_METHOD_TOOLTIP;Low = Reinforce low light,\nUniform = Equalize action,\nHigh = Reinforce high light,\nHighlights = Remove magenta in highlights.
!TP_RETINEX_MLABEL;Restored haze-free Min=%1 Max=%2
!TP_RETINEX_MLABEL_TOOLTIP;Should be near min=0 max=32768\nRestored image with no mixture.
!TP_RETINEX_NEIGHBOR;Neighboring pixels
diff --git a/rtdata/languages/Serbian (Cyrilic Characters) b/rtdata/languages/Serbian (Cyrilic Characters)
index 344818259..8cce1ff7c 100644
--- a/rtdata/languages/Serbian (Cyrilic Characters)
+++ b/rtdata/languages/Serbian (Cyrilic Characters)
@@ -1308,7 +1308,7 @@ ZOOMPANEL_ZOOMOUT;Умањује приказ слике -
!SAVEDLG_SUBSAMP_1;Best compression
!SAVEDLG_SUBSAMP_2;Balanced
!SAVEDLG_SUBSAMP_3;Best quality
-!SAVEDLG_SUBSAMP_TOOLTIP;Best compression: 4:1:1\nBalanced: 4:2:2\nBest quality: 4:4:4
+!SAVEDLG_SUBSAMP_TOOLTIP;Best compression:\nJ:a:b 4:2:0\nh/v 2/2\nChroma halved horizontally and vertically.\n\nBalanced:\nJ:a:b 4:2:2\nh/v 2/1\nChroma halved horizontally.\n\nBest quality:\nJ:a:b 4:4:4\nh/v 1/1\nNo chroma subsampling.
!SAVEDLG_WARNFILENAME;File will be named
!SHCSELECTOR_TOOLTIP;Click right mouse button to reset the position of those 3 sliders.
!THRESHOLDSELECTOR_BL;Bottom-left
@@ -1700,9 +1700,9 @@ ZOOMPANEL_ZOOMOUT;Умањује приказ слике -
!TP_RETINEX_CURVEEDITOR_CD_TOOLTIP;Luminance according to luminance L=f(L)\nCorrect raw data to reduce halos and artifacts.
!TP_RETINEX_CURVEEDITOR_LH;Strength=f(H)
!TP_RETINEX_CURVEEDITOR_LH_TOOLTIP;Strength according to hue Strength=f(H)\nThis curve also acts on chroma when using the "Highlight" retinex method.
+!TP_RETINEX_FREEGAMMA;Free gamma
!TP_RETINEX_GAIN;Gain
-!TP_RETINEX_GAIN_TOOLTIP;Acts on the transmission in combination with the offset. This is very different from the others settings. Used for black or white pixels, and to help balance the histogram.
-!TP_RETINEX_GAMMA;Free gamma
+!TP_RETINEX_GAIN_TOOLTIP;Acts on the restored image.\n\nThis is very different from the others settings. Used for black or white pixels, and to help balance the histogram.
!TP_RETINEX_GAMMA;Gamma
!TP_RETINEX_GAMMA_FREE;Free
!TP_RETINEX_GAMMA_HIGH;High
@@ -1721,7 +1721,7 @@ ZOOMPANEL_ZOOMOUT;Умањује приказ слике -
!TP_RETINEX_LOW;Low
!TP_RETINEX_MEDIAN;Transmission median filter
!TP_RETINEX_METHOD;Method
-!TP_RETINEX_METHOD_TOOLTIP;Low = Reinforce low light,\nUniform = Equalize action,\nHigh = Reinforce high light,\nHighlight = Remove magenta in highlights.
+!TP_RETINEX_METHOD_TOOLTIP;Low = Reinforce low light,\nUniform = Equalize action,\nHigh = Reinforce high light,\nHighlights = Remove magenta in highlights.
!TP_RETINEX_MLABEL;Restored haze-free Min=%1 Max=%2
!TP_RETINEX_MLABEL_TOOLTIP;Should be near min=0 max=32768\nRestored image with no mixture.
!TP_RETINEX_NEIGHBOR;Neighboring pixels
diff --git a/rtdata/languages/Serbian (Latin Characters) b/rtdata/languages/Serbian (Latin Characters)
index dab79ad6b..8554faaa6 100644
--- a/rtdata/languages/Serbian (Latin Characters)
+++ b/rtdata/languages/Serbian (Latin Characters)
@@ -1308,7 +1308,7 @@ ZOOMPANEL_ZOOMOUT;Umanjuje prikaz slike -
!SAVEDLG_SUBSAMP_1;Best compression
!SAVEDLG_SUBSAMP_2;Balanced
!SAVEDLG_SUBSAMP_3;Best quality
-!SAVEDLG_SUBSAMP_TOOLTIP;Best compression: 4:1:1\nBalanced: 4:2:2\nBest quality: 4:4:4
+!SAVEDLG_SUBSAMP_TOOLTIP;Best compression:\nJ:a:b 4:2:0\nh/v 2/2\nChroma halved horizontally and vertically.\n\nBalanced:\nJ:a:b 4:2:2\nh/v 2/1\nChroma halved horizontally.\n\nBest quality:\nJ:a:b 4:4:4\nh/v 1/1\nNo chroma subsampling.
!SAVEDLG_WARNFILENAME;File will be named
!SHCSELECTOR_TOOLTIP;Click right mouse button to reset the position of those 3 sliders.
!THRESHOLDSELECTOR_BL;Bottom-left
@@ -1700,9 +1700,9 @@ ZOOMPANEL_ZOOMOUT;Umanjuje prikaz slike -
!TP_RETINEX_CURVEEDITOR_CD_TOOLTIP;Luminance according to luminance L=f(L)\nCorrect raw data to reduce halos and artifacts.
!TP_RETINEX_CURVEEDITOR_LH;Strength=f(H)
!TP_RETINEX_CURVEEDITOR_LH_TOOLTIP;Strength according to hue Strength=f(H)\nThis curve also acts on chroma when using the "Highlight" retinex method.
+!TP_RETINEX_FREEGAMMA;Free gamma
!TP_RETINEX_GAIN;Gain
-!TP_RETINEX_GAIN_TOOLTIP;Acts on the transmission in combination with the offset. This is very different from the others settings. Used for black or white pixels, and to help balance the histogram.
-!TP_RETINEX_GAMMA;Free gamma
+!TP_RETINEX_GAIN_TOOLTIP;Acts on the restored image.\n\nThis is very different from the others settings. Used for black or white pixels, and to help balance the histogram.
!TP_RETINEX_GAMMA;Gamma
!TP_RETINEX_GAMMA_FREE;Free
!TP_RETINEX_GAMMA_HIGH;High
@@ -1721,7 +1721,7 @@ ZOOMPANEL_ZOOMOUT;Umanjuje prikaz slike -
!TP_RETINEX_LOW;Low
!TP_RETINEX_MEDIAN;Transmission median filter
!TP_RETINEX_METHOD;Method
-!TP_RETINEX_METHOD_TOOLTIP;Low = Reinforce low light,\nUniform = Equalize action,\nHigh = Reinforce high light,\nHighlight = Remove magenta in highlights.
+!TP_RETINEX_METHOD_TOOLTIP;Low = Reinforce low light,\nUniform = Equalize action,\nHigh = Reinforce high light,\nHighlights = Remove magenta in highlights.
!TP_RETINEX_MLABEL;Restored haze-free Min=%1 Max=%2
!TP_RETINEX_MLABEL_TOOLTIP;Should be near min=0 max=32768\nRestored image with no mixture.
!TP_RETINEX_NEIGHBOR;Neighboring pixels
diff --git a/rtdata/languages/Slovak b/rtdata/languages/Slovak
index 0a5010a0f..1ed320a26 100644
--- a/rtdata/languages/Slovak
+++ b/rtdata/languages/Slovak
@@ -1251,7 +1251,7 @@ ZOOMPANEL_ZOOMOUT;Oddialiť -
!SAVEDLG_SUBSAMP_1;Best compression
!SAVEDLG_SUBSAMP_2;Balanced
!SAVEDLG_SUBSAMP_3;Best quality
-!SAVEDLG_SUBSAMP_TOOLTIP;Best compression: 4:1:1\nBalanced: 4:2:2\nBest quality: 4:4:4
+!SAVEDLG_SUBSAMP_TOOLTIP;Best compression:\nJ:a:b 4:2:0\nh/v 2/2\nChroma halved horizontally and vertically.\n\nBalanced:\nJ:a:b 4:2:2\nh/v 2/1\nChroma halved horizontally.\n\nBest quality:\nJ:a:b 4:4:4\nh/v 1/1\nNo chroma subsampling.
!SAVEDLG_WARNFILENAME;File will be named
!SHCSELECTOR_TOOLTIP;Click right mouse button to reset the position of those 3 sliders.
!THRESHOLDSELECTOR_BL;Bottom-left
@@ -1689,9 +1689,9 @@ ZOOMPANEL_ZOOMOUT;Oddialiť -
!TP_RETINEX_CURVEEDITOR_CD_TOOLTIP;Luminance according to luminance L=f(L)\nCorrect raw data to reduce halos and artifacts.
!TP_RETINEX_CURVEEDITOR_LH;Strength=f(H)
!TP_RETINEX_CURVEEDITOR_LH_TOOLTIP;Strength according to hue Strength=f(H)\nThis curve also acts on chroma when using the "Highlight" retinex method.
+!TP_RETINEX_FREEGAMMA;Free gamma
!TP_RETINEX_GAIN;Gain
-!TP_RETINEX_GAIN_TOOLTIP;Acts on the transmission in combination with the offset. This is very different from the others settings. Used for black or white pixels, and to help balance the histogram.
-!TP_RETINEX_GAMMA;Free gamma
+!TP_RETINEX_GAIN_TOOLTIP;Acts on the restored image.\n\nThis is very different from the others settings. Used for black or white pixels, and to help balance the histogram.
!TP_RETINEX_GAMMA;Gamma
!TP_RETINEX_GAMMA_FREE;Free
!TP_RETINEX_GAMMA_HIGH;High
@@ -1710,7 +1710,7 @@ ZOOMPANEL_ZOOMOUT;Oddialiť -
!TP_RETINEX_LOW;Low
!TP_RETINEX_MEDIAN;Transmission median filter
!TP_RETINEX_METHOD;Method
-!TP_RETINEX_METHOD_TOOLTIP;Low = Reinforce low light,\nUniform = Equalize action,\nHigh = Reinforce high light,\nHighlight = Remove magenta in highlights.
+!TP_RETINEX_METHOD_TOOLTIP;Low = Reinforce low light,\nUniform = Equalize action,\nHigh = Reinforce high light,\nHighlights = Remove magenta in highlights.
!TP_RETINEX_MLABEL;Restored haze-free Min=%1 Max=%2
!TP_RETINEX_MLABEL_TOOLTIP;Should be near min=0 max=32768\nRestored image with no mixture.
!TP_RETINEX_NEIGHBOR;Neighboring pixels
diff --git a/rtdata/languages/Suomi b/rtdata/languages/Suomi
index 0e792a868..8aa819aa3 100644
--- a/rtdata/languages/Suomi
+++ b/rtdata/languages/Suomi
@@ -1212,7 +1212,7 @@ TP_WBALANCE_TEMPERATURE;Lämpötila [K]
!SAVEDLG_SUBSAMP_1;Best compression
!SAVEDLG_SUBSAMP_2;Balanced
!SAVEDLG_SUBSAMP_3;Best quality
-!SAVEDLG_SUBSAMP_TOOLTIP;Best compression: 4:1:1\nBalanced: 4:2:2\nBest quality: 4:4:4
+!SAVEDLG_SUBSAMP_TOOLTIP;Best compression:\nJ:a:b 4:2:0\nh/v 2/2\nChroma halved horizontally and vertically.\n\nBalanced:\nJ:a:b 4:2:2\nh/v 2/1\nChroma halved horizontally.\n\nBest quality:\nJ:a:b 4:4:4\nh/v 1/1\nNo chroma subsampling.
!SAVEDLG_WARNFILENAME;File will be named
!SHCSELECTOR_TOOLTIP;Click right mouse button to reset the position of those 3 sliders.
!THRESHOLDSELECTOR_BL;Bottom-left
@@ -1682,9 +1682,9 @@ TP_WBALANCE_TEMPERATURE;Lämpötila [K]
!TP_RETINEX_CURVEEDITOR_CD_TOOLTIP;Luminance according to luminance L=f(L)\nCorrect raw data to reduce halos and artifacts.
!TP_RETINEX_CURVEEDITOR_LH;Strength=f(H)
!TP_RETINEX_CURVEEDITOR_LH_TOOLTIP;Strength according to hue Strength=f(H)\nThis curve also acts on chroma when using the "Highlight" retinex method.
+!TP_RETINEX_FREEGAMMA;Free gamma
!TP_RETINEX_GAIN;Gain
-!TP_RETINEX_GAIN_TOOLTIP;Acts on the transmission in combination with the offset. This is very different from the others settings. Used for black or white pixels, and to help balance the histogram.
-!TP_RETINEX_GAMMA;Free gamma
+!TP_RETINEX_GAIN_TOOLTIP;Acts on the restored image.\n\nThis is very different from the others settings. Used for black or white pixels, and to help balance the histogram.
!TP_RETINEX_GAMMA;Gamma
!TP_RETINEX_GAMMA_FREE;Free
!TP_RETINEX_GAMMA_HIGH;High
@@ -1703,7 +1703,7 @@ TP_WBALANCE_TEMPERATURE;Lämpötila [K]
!TP_RETINEX_LOW;Low
!TP_RETINEX_MEDIAN;Transmission median filter
!TP_RETINEX_METHOD;Method
-!TP_RETINEX_METHOD_TOOLTIP;Low = Reinforce low light,\nUniform = Equalize action,\nHigh = Reinforce high light,\nHighlight = Remove magenta in highlights.
+!TP_RETINEX_METHOD_TOOLTIP;Low = Reinforce low light,\nUniform = Equalize action,\nHigh = Reinforce high light,\nHighlights = Remove magenta in highlights.
!TP_RETINEX_MLABEL;Restored haze-free Min=%1 Max=%2
!TP_RETINEX_MLABEL_TOOLTIP;Should be near min=0 max=32768\nRestored image with no mixture.
!TP_RETINEX_NEIGHBOR;Neighboring pixels
diff --git a/rtdata/languages/Swedish b/rtdata/languages/Swedish
index 16f8686b6..3a63b8b0e 100644
--- a/rtdata/languages/Swedish
+++ b/rtdata/languages/Swedish
@@ -1039,7 +1039,6 @@ SAVEDLG_SAVESPP;Spara behandlingsparametrarna med bilderna
SAVEDLG_SUBSAMP_1;Högsta komprimering
SAVEDLG_SUBSAMP_2;Balanserad
SAVEDLG_SUBSAMP_3;Högsta kvalitet
-SAVEDLG_SUBSAMP_TOOLTIP;Högsta komprimering: 4:1:1\nBalanserad: 4:2:2\nHögsta kvalitet: 4:4:4
SAVEDLG_TIFFUNCOMPRESSED;Okomprimerad TIFF
SAVEDLG_WARNFILENAME;Filen kommer att heta
SHCSELECTOR_TOOLTIP;Klicka på höger musknapp för att återställa\nde tre reglagens positioner
@@ -1790,6 +1789,7 @@ ZOOMPANEL_ZOOMOUT;Förminska.\nKortkommando: -
!PREFERENCES_MIN;Mini (100x115)
!PREFERENCES_SIMPLAUT;Tool mode
!PREFERENCES_TINB;Number of tiles
+!SAVEDLG_SUBSAMP_TOOLTIP;Best compression:\nJ:a:b 4:2:0\nh/v 2/2\nChroma halved horizontally and vertically.\n\nBalanced:\nJ:a:b 4:2:2\nh/v 2/1\nChroma halved horizontally.\n\nBest quality:\nJ:a:b 4:4:4\nh/v 1/1\nNo chroma subsampling.
!TP_COLORTONING_CURVEEDITOR_CL_TOOLTIP;Chroma opacity as a function of luminance oC=f(L)
!TP_COLORTONING_LABEL;Color Toning
!TP_COLORTONING_LAB;L*a*b* blending
@@ -1842,9 +1842,9 @@ ZOOMPANEL_ZOOMOUT;Förminska.\nKortkommando: -
!TP_RETINEX_CURVEEDITOR_CD_TOOLTIP;Luminance according to luminance L=f(L)\nCorrect raw data to reduce halos and artifacts.
!TP_RETINEX_CURVEEDITOR_LH;Strength=f(H)
!TP_RETINEX_CURVEEDITOR_LH_TOOLTIP;Strength according to hue Strength=f(H)\nThis curve also acts on chroma when using the "Highlight" retinex method.
+!TP_RETINEX_FREEGAMMA;Free gamma
!TP_RETINEX_GAIN;Gain
-!TP_RETINEX_GAIN_TOOLTIP;Acts on the transmission in combination with the offset. This is very different from the others settings. Used for black or white pixels, and to help balance the histogram.
-!TP_RETINEX_GAMMA;Free gamma
+!TP_RETINEX_GAIN_TOOLTIP;Acts on the restored image.\n\nThis is very different from the others settings. Used for black or white pixels, and to help balance the histogram.
!TP_RETINEX_GAMMA;Gamma
!TP_RETINEX_GAMMA_FREE;Free
!TP_RETINEX_GAMMA_HIGH;High
@@ -1863,7 +1863,7 @@ ZOOMPANEL_ZOOMOUT;Förminska.\nKortkommando: -
!TP_RETINEX_LOW;Low
!TP_RETINEX_MEDIAN;Transmission median filter
!TP_RETINEX_METHOD;Method
-!TP_RETINEX_METHOD_TOOLTIP;Low = Reinforce low light,\nUniform = Equalize action,\nHigh = Reinforce high light,\nHighlight = Remove magenta in highlights.
+!TP_RETINEX_METHOD_TOOLTIP;Low = Reinforce low light,\nUniform = Equalize action,\nHigh = Reinforce high light,\nHighlights = Remove magenta in highlights.
!TP_RETINEX_MLABEL;Restored haze-free Min=%1 Max=%2
!TP_RETINEX_MLABEL_TOOLTIP;Should be near min=0 max=32768\nRestored image with no mixture.
!TP_RETINEX_NEIGHBOR;Neighboring pixels
diff --git a/rtdata/languages/Turkish b/rtdata/languages/Turkish
index aaf21ef75..d90924f87 100644
--- a/rtdata/languages/Turkish
+++ b/rtdata/languages/Turkish
@@ -1211,7 +1211,7 @@ TP_WBALANCE_TEMPERATURE;Isı
!SAVEDLG_SUBSAMP_1;Best compression
!SAVEDLG_SUBSAMP_2;Balanced
!SAVEDLG_SUBSAMP_3;Best quality
-!SAVEDLG_SUBSAMP_TOOLTIP;Best compression: 4:1:1\nBalanced: 4:2:2\nBest quality: 4:4:4
+!SAVEDLG_SUBSAMP_TOOLTIP;Best compression:\nJ:a:b 4:2:0\nh/v 2/2\nChroma halved horizontally and vertically.\n\nBalanced:\nJ:a:b 4:2:2\nh/v 2/1\nChroma halved horizontally.\n\nBest quality:\nJ:a:b 4:4:4\nh/v 1/1\nNo chroma subsampling.
!SAVEDLG_WARNFILENAME;File will be named
!SHCSELECTOR_TOOLTIP;Click right mouse button to reset the position of those 3 sliders.
!THRESHOLDSELECTOR_BL;Bottom-left
@@ -1681,9 +1681,9 @@ TP_WBALANCE_TEMPERATURE;Isı
!TP_RETINEX_CURVEEDITOR_CD_TOOLTIP;Luminance according to luminance L=f(L)\nCorrect raw data to reduce halos and artifacts.
!TP_RETINEX_CURVEEDITOR_LH;Strength=f(H)
!TP_RETINEX_CURVEEDITOR_LH_TOOLTIP;Strength according to hue Strength=f(H)\nThis curve also acts on chroma when using the "Highlight" retinex method.
+!TP_RETINEX_FREEGAMMA;Free gamma
!TP_RETINEX_GAIN;Gain
-!TP_RETINEX_GAIN_TOOLTIP;Acts on the transmission in combination with the offset. This is very different from the others settings. Used for black or white pixels, and to help balance the histogram.
-!TP_RETINEX_GAMMA;Free gamma
+!TP_RETINEX_GAIN_TOOLTIP;Acts on the restored image.\n\nThis is very different from the others settings. Used for black or white pixels, and to help balance the histogram.
!TP_RETINEX_GAMMA;Gamma
!TP_RETINEX_GAMMA_FREE;Free
!TP_RETINEX_GAMMA_HIGH;High
@@ -1702,7 +1702,7 @@ TP_WBALANCE_TEMPERATURE;Isı
!TP_RETINEX_LOW;Low
!TP_RETINEX_MEDIAN;Transmission median filter
!TP_RETINEX_METHOD;Method
-!TP_RETINEX_METHOD_TOOLTIP;Low = Reinforce low light,\nUniform = Equalize action,\nHigh = Reinforce high light,\nHighlight = Remove magenta in highlights.
+!TP_RETINEX_METHOD_TOOLTIP;Low = Reinforce low light,\nUniform = Equalize action,\nHigh = Reinforce high light,\nHighlights = Remove magenta in highlights.
!TP_RETINEX_MLABEL;Restored haze-free Min=%1 Max=%2
!TP_RETINEX_MLABEL_TOOLTIP;Should be near min=0 max=32768\nRestored image with no mixture.
!TP_RETINEX_NEIGHBOR;Neighboring pixels
diff --git a/rtdata/languages/default b/rtdata/languages/default
index 6c1918a89..b80a74788 100644
--- a/rtdata/languages/default
+++ b/rtdata/languages/default
@@ -1109,7 +1109,7 @@ SAVEDLG_SUBSAMP;Subsampling
SAVEDLG_SUBSAMP_1;Best compression
SAVEDLG_SUBSAMP_2;Balanced
SAVEDLG_SUBSAMP_3;Best quality
-SAVEDLG_SUBSAMP_TOOLTIP;Best compression: 4:1:1\nBalanced: 4:2:2\nBest quality: 4:4:4
+SAVEDLG_SUBSAMP_TOOLTIP;Best compression:\nJ:a:b 4:2:0\nh/v 2/2\nChroma halved horizontally and vertically.\n\nBalanced:\nJ:a:b 4:2:2\nh/v 2/1\nChroma halved horizontally.\n\nBest quality:\nJ:a:b 4:4:4\nh/v 1/1\nNo chroma subsampling.
SAVEDLG_TIFFUNCOMPRESSED;Uncompressed TIFF
SAVEDLG_WARNFILENAME;File will be named
SHCSELECTOR_TOOLTIP;Click right mouse button to reset the position of those 3 sliders.
@@ -1640,9 +1640,9 @@ TP_RETINEX_CURVEEDITOR_CD;L=f(L)
TP_RETINEX_CURVEEDITOR_CD_TOOLTIP;Luminance according to luminance L=f(L)\nCorrect raw data to reduce halos and artifacts.
TP_RETINEX_CURVEEDITOR_LH;Strength=f(H)
TP_RETINEX_CURVEEDITOR_LH_TOOLTIP;Strength according to hue Strength=f(H)\nThis curve also acts on chroma when using the "Highlight" retinex method.
+TP_RETINEX_FREEGAMMA;Free gamma
TP_RETINEX_GAIN;Gain
-TP_RETINEX_GAIN_TOOLTIP;Acts on the transmission in combination with the offset. This is very different from the others settings. Used for black or white pixels, and to help balance the histogram.
-TP_RETINEX_GAMMA;Free gamma
+TP_RETINEX_GAIN_TOOLTIP;Acts on the restored image.\n\nThis is very different from the others settings. Used for black or white pixels, and to help balance the histogram.
TP_RETINEX_GAMMA;Gamma
TP_RETINEX_GAMMA_FREE;Free
TP_RETINEX_GAMMA_HIGH;High
@@ -1661,7 +1661,7 @@ TP_RETINEX_LABSPACE;L*a*b*
TP_RETINEX_LOW;Low
TP_RETINEX_MEDIAN;Transmission median filter
TP_RETINEX_METHOD;Method
-TP_RETINEX_METHOD_TOOLTIP;Low = Reinforce low light,\nUniform = Equalize action,\nHigh = Reinforce high light,\nHighlight = Remove magenta in highlights.
+TP_RETINEX_METHOD_TOOLTIP;Low = Reinforce low light,\nUniform = Equalize action,\nHigh = Reinforce high light,\nHighlights = Remove magenta in highlights.
TP_RETINEX_MLABEL;Restored haze-free Min=%1 Max=%2
TP_RETINEX_MLABEL_TOOLTIP;Should be near min=0 max=32768\nRestored image with no mixture.
TP_RETINEX_NEIGHBOR;Neighboring pixels
diff --git a/rtengine/boxblur.h b/rtengine/boxblur.h
index b25d3e4b7..b360c3042 100644
--- a/rtengine/boxblur.h
+++ b/rtengine/boxblur.h
@@ -23,16 +23,10 @@
#include
#include
#include "alignedbuffer.h"
-#ifdef _OPENMP
-#include
-#endif
-
#include "rt_math.h"
#include "opthelper.h"
-//using namespace rtengine;
-
namespace rtengine
{
@@ -129,13 +123,202 @@ template void boxblur (T** src, A** dst, int radx, int rady, i
}
+template SSEFUNCTION void boxblur (T** src, A** dst, T* buffer, int radx, int rady, int W, int H)
+{
+
+ //%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+ //box blur image; box range = (radx,rady)
+
+ float* temp = buffer;
+
+ if (radx == 0) {
+#ifdef _OPENMP
+ #pragma omp for
+#endif
+
+ for (int row = 0; row < H; row++)
+ for (int col = 0; col < W; col++) {
+ temp[row * W + col] = (float)src[row][col];
+ }
+ } else {
+ //horizontal blur
+#ifdef _OPENMP
+ #pragma omp for
+#endif
+
+ for (int row = 0; row < H; row++) {
+ float len = radx + 1;
+ float tempval = (float)src[row][0];
+
+ for (int j = 1; j <= radx; j++) {
+ tempval += (float)src[row][j];
+ }
+
+ tempval /= len;
+ temp[row * W + 0] = tempval;
+
+ for (int col = 1; col <= radx; col++) {
+ temp[row * W + col] = tempval = (tempval * len + (float)src[row][col + radx]) / (len + 1);
+ len ++;
+ }
+
+ for (int col = radx + 1; col < W - radx; col++) {
+ temp[row * W + col] = tempval = tempval + ((float)(src[row][col + radx] - src[row][col - radx - 1])) / len;
+ }
+
+ for (int col = W - radx; col < W; col++) {
+ temp[row * W + col] = tempval = (tempval * len - src[row][col - radx - 1]) / (len - 1);
+ len --;
+ }
+ }
+ }
+
+ if (rady == 0) {
+#ifdef _OPENMP
+ #pragma omp for
+#endif
+
+ for (int row = 0; row < H; row++)
+ for (int col = 0; col < W; col++) {
+ dst[row][col] = temp[row * W + col];
+ }
+ } else {
+ const int numCols = 8; // process numCols columns at once for better usage of L1 cpu cache
+#ifdef __SSE2__
+ vfloat leninitv = F2V( (float)(rady + 1));
+ vfloat onev = F2V( 1.f );
+ vfloat tempv, temp1v, lenv, lenp1v, lenm1v, rlenv;
+
+#ifdef _OPENMP
+ #pragma omp for
+#endif
+
+ for (int col = 0; col < W - 7; col += 8) {
+ lenv = leninitv;
+ tempv = LVFU(temp[0 * W + col]);
+ temp1v = LVFU(temp[0 * W + col + 4]);
+
+ for (int i = 1; i <= rady; i++) {
+ tempv = tempv + LVFU(temp[i * W + col]);
+ temp1v = temp1v + LVFU(temp[i * W + col + 4]);
+ }
+
+ tempv = tempv / lenv;
+ temp1v = temp1v / lenv;
+ STVFU( dst[0][col], tempv);
+ STVFU( dst[0][col + 4], temp1v);
+
+ for (int row = 1; row <= rady; row++) {
+ lenp1v = lenv + onev;
+ tempv = (tempv * lenv + LVFU(temp[(row + rady) * W + col])) / lenp1v;
+ temp1v = (temp1v * lenv + LVFU(temp[(row + rady) * W + col + 4])) / lenp1v;
+ STVFU( dst[row][col], tempv);
+ STVFU( dst[row][col + 4], temp1v);
+ lenv = lenp1v;
+ }
+
+ rlenv = onev / lenv;
+
+ for (int row = rady + 1; row < H - rady; row++) {
+ tempv = tempv + (LVFU(temp[(row + rady) * W + col]) - LVFU(temp[(row - rady - 1) * W + col])) * rlenv ;
+ temp1v = temp1v + (LVFU(temp[(row + rady) * W + col + 4]) - LVFU(temp[(row - rady - 1) * W + col + 4])) * rlenv ;
+ STVFU( dst[row][col], tempv);
+ STVFU( dst[row][col + 4], temp1v);
+ }
+
+ for (int row = H - rady; row < H; row++) {
+ lenm1v = lenv - onev;
+ tempv = (tempv * lenv - LVFU(temp[(row - rady - 1) * W + col])) / lenm1v;
+ temp1v = (temp1v * lenv - LVFU(temp[(row - rady - 1) * W + col + 4])) / lenm1v;
+ STVFU( dst[row][col], tempv);
+ STVFU( dst[row][col + 4], temp1v);
+ lenv = lenm1v;
+ }
+ }
+
+#else
+ //vertical blur
+#ifdef _OPENMP
+ #pragma omp for
+#endif
+
+ for (int col = 0; col < W - numCols + 1; col += 8) {
+ float len = rady + 1;
+
+ for(int k = 0; k < numCols; k++) {
+ dst[0][col + k] = temp[0 * W + col + k];
+ }
+
+ for (int i = 1; i <= rady; i++) {
+ for(int k = 0; k < numCols; k++) {
+ dst[0][col + k] += temp[i * W + col + k];
+ }
+ }
+
+ for(int k = 0; k < numCols; k++) {
+ dst[0][col + k] /= len;
+ }
+
+ for (int row = 1; row <= rady; row++) {
+ for(int k = 0; k < numCols; k++) {
+ dst[row][col + k] = (dst[(row - 1)][col + k] * len + temp[(row + rady) * W + col + k]) / (len + 1);
+ }
+
+ len ++;
+ }
+
+ for (int row = rady + 1; row < H - rady; row++) {
+ for(int k = 0; k < numCols; k++) {
+ dst[row][col + k] = dst[(row - 1)][col + k] + (temp[(row + rady) * W + col + k] - temp[(row - rady - 1) * W + col + k]) / len;
+ }
+ }
+
+ for (int row = H - rady; row < H; row++) {
+ for(int k = 0; k < numCols; k++) {
+ dst[row][col + k] = (dst[(row - 1)][col + k] * len - temp[(row - rady - 1) * W + col + k]) / (len - 1);
+ }
+
+ len --;
+ }
+ }
+
+#endif
+#ifdef _OPENMP
+ #pragma omp single
+#endif
+
+ for (int col = W - (W % numCols); col < W; col++) {
+ float len = rady + 1;
+ dst[0][col] = temp[0 * W + col] / len;
+
+ for (int i = 1; i <= rady; i++) {
+ dst[0][col] += temp[i * W + col] / len;
+ }
+
+ for (int row = 1; row <= rady; row++) {
+ dst[row][col] = (dst[(row - 1)][col] * len + temp[(row + rady) * W + col]) / (len + 1);
+ len ++;
+ }
+
+ for (int row = rady + 1; row < H - rady; row++) {
+ dst[row][col] = dst[(row - 1)][col] + (temp[(row + rady) * W + col] - temp[(row - rady - 1) * W + col]) / len;
+ }
+
+ for (int row = H - rady; row < H; row++) {
+ dst[row][col] = (dst[(row - 1)][col] * len - temp[(row - rady - 1) * W + col]) / (len - 1);
+ len --;
+ }
+ }
+ }
+
+}
+
//%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
//%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
template SSEFUNCTION void boxblur (T* src, A* dst, A* buffer, int radx, int rady, int W, int H)
{
-//printf("boxblur\n");
//%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
//box blur image; box range = (radx,rady) i.e. box size is (2*radx+1)x(2*rady+1)
@@ -188,9 +371,9 @@ template SSEFUNCTION void boxblur (T* src, A* dst, A* buffer,
} else {
//vertical blur
#ifdef __SSE2__
- __m128 leninitv = _mm_set1_ps( (float)(rady + 1));
- __m128 onev = _mm_set1_ps( 1.0f );
- __m128 tempv, temp1v, lenv, lenp1v, lenm1v, rlenv;
+ vfloat leninitv = F2V( (float)(rady + 1));
+ vfloat onev = F2V( 1.f );
+ vfloat tempv, temp1v, lenv, lenp1v, lenm1v, rlenv;
int col;
for (col = 0; col < W - 7; col += 8) {
@@ -205,15 +388,15 @@ template SSEFUNCTION void boxblur (T* src, A* dst, A* buffer,
tempv = tempv / lenv;
temp1v = temp1v / lenv;
- _mm_storeu_ps( &dst[0 * W + col], tempv);
- _mm_storeu_ps( &dst[0 * W + col + 4], temp1v);
+ STVFU( dst[0 * W + col], tempv);
+ STVFU( dst[0 * W + col + 4], temp1v);
for (int row = 1; row <= rady; row++) {
lenp1v = lenv + onev;
tempv = (tempv * lenv + LVFU(temp[(row + rady) * W + col])) / lenp1v;
temp1v = (temp1v * lenv + LVFU(temp[(row + rady) * W + col + 4])) / lenp1v;
- _mm_storeu_ps( &dst[row * W + col], tempv);
- _mm_storeu_ps( &dst[row * W + col + 4], temp1v);
+ STVFU( dst[row * W + col], tempv);
+ STVFU( dst[row * W + col + 4], temp1v);
lenv = lenp1v;
}
@@ -222,16 +405,16 @@ template SSEFUNCTION void boxblur (T* src, A* dst, A* buffer,
for (int row = rady + 1; row < H - rady; row++) {
tempv = tempv + (LVFU(temp[(row + rady) * W + col]) - LVFU(temp[(row - rady - 1) * W + col])) * rlenv ;
temp1v = temp1v + (LVFU(temp[(row + rady) * W + col + 4]) - LVFU(temp[(row - rady - 1) * W + col + 4])) * rlenv ;
- _mm_storeu_ps( &dst[row * W + col], tempv);
- _mm_storeu_ps( &dst[row * W + col + 4], temp1v);
+ STVFU( dst[row * W + col], tempv);
+ STVFU( dst[row * W + col + 4], temp1v);
}
for (int row = H - rady; row < H; row++) {
lenm1v = lenv - onev;
tempv = (tempv * lenv - LVFU(temp[(row - rady - 1) * W + col])) / lenm1v;
temp1v = (temp1v * lenv - LVFU(temp[(row - rady - 1) * W + col + 4])) / lenm1v;
- _mm_storeu_ps( &dst[row * W + col], tempv);
- _mm_storeu_ps( &dst[row * W + col + 4], temp1v);
+ STVFU( dst[row * W + col], tempv);
+ STVFU( dst[row * W + col + 4], temp1v);
lenv = lenm1v;
}
}
@@ -245,12 +428,12 @@ template SSEFUNCTION void boxblur (T* src, A* dst, A* buffer,
}
tempv = tempv / lenv;
- _mm_storeu_ps( &dst[0 * W + col], tempv);
+ STVFU( dst[0 * W + col], tempv);
for (int row = 1; row <= rady; row++) {
lenp1v = lenv + onev;
tempv = (tempv * lenv + LVFU(temp[(row + rady) * W + col])) / lenp1v;
- _mm_storeu_ps( &dst[row * W + col], tempv);
+ STVFU( dst[row * W + col], tempv);
lenv = lenp1v;
}
@@ -258,13 +441,13 @@ template SSEFUNCTION void boxblur (T* src, A* dst, A* buffer,
for (int row = rady + 1; row < H - rady; row++) {
tempv = tempv + (LVFU(temp[(row + rady) * W + col]) - LVFU(temp[(row - rady - 1) * W + col])) * rlenv ;
- _mm_storeu_ps( &dst[row * W + col], tempv);
+ STVFU( dst[row * W + col], tempv);
}
for (int row = H - rady; row < H; row++) {
lenm1v = lenv - onev;
tempv = (tempv * lenv - LVFU(temp[(row - rady - 1) * W + col])) / lenm1v;
- _mm_storeu_ps( &dst[row * W + col], tempv);
+ STVFU( dst[row * W + col], tempv);
lenv = lenm1v;
}
}
@@ -858,9 +1041,9 @@ template SSEFUNCTION void boxabsblur (T* src, A* dst, int radx
} else {
//vertical blur
#ifdef __SSE2__
- __m128 leninitv = _mm_set1_ps( (float)(rady + 1));
- __m128 onev = _mm_set1_ps( 1.0f );
- __m128 tempv, lenv, lenp1v, lenm1v, rlenv;
+ vfloat leninitv = F2V( (float)(rady + 1));
+ vfloat onev = F2V( 1.f );
+ vfloat tempv, lenv, lenp1v, lenm1v, rlenv;
for (int col = 0; col < W - 3; col += 4) {
lenv = leninitv;
diff --git a/rtengine/gauss.h b/rtengine/gauss.h
index 61e5e2fe4..4136e6f6d 100644
--- a/rtengine/gauss.h
+++ b/rtengine/gauss.h
@@ -23,7 +23,8 @@
#include
#include
#include "opthelper.h"
-
+#include "stdio.h"
+#include "boxblur.h"
// classical filtering if the support window is small:
template void gaussHorizontal3 (T** src, T** dst, int W, int H, const float c0, const float c1)
@@ -74,8 +75,8 @@ template void gaussVertical3 (T** src, T** dst, int W, int H, const flo
#ifdef __SSE2__
template SSEFUNCTION void gaussVertical3Sse (T** src, T** dst, int W, int H, const float c0, const float c1)
{
- __m128 Tv, Tm1v, Tp1v;
- __m128 c0v, c1v;
+ vfloat Tv, Tm1v, Tp1v;
+ vfloat c0v, c1v;
c0v = F2V(c0);
c1v = F2V(c1);
#ifdef _OPENMP
@@ -121,8 +122,8 @@ template SSEFUNCTION void gaussHorizontal3Sse (T** src, T** dst, int W,
{
float tmp[W][4] ALIGNED16;
- __m128 Tv, Tm1v, Tp1v;
- __m128 c0v, c1v;
+ vfloat Tv, Tm1v, Tp1v;
+ vfloat c0v, c1v;
c0v = F2V(c0);
c1v = F2V(c1);
#ifdef _OPENMP
@@ -240,12 +241,12 @@ template SSEFUNCTION void gaussHorizontalSse (T** src, T** dst, int W,
M[i][j] /= (1.0 + b1 - b2 + b3) * (1.0 - b1 - b2 - b3);
}
+ vfloat Rv;
+ vfloat Tv, Tm2v, Tm3v;
+ vfloat Bv, b1v, b2v, b3v;
+ vfloat temp2W, temp2Wp1;
float tmp[W][4] ALIGNED16;
float tmpV[4] ALIGNED16;
- __m128 Rv;
- __m128 Tv, Tm2v, Tm3v;
- __m128 Bv, b1v, b2v, b3v;
- __m128 temp2W, temp2Wp1;
Bv = F2V(B);
b1v = F2V(b1);
b2v = F2V(b2);
@@ -527,10 +528,10 @@ template SSEFUNCTION void gaussVerticalSse (T** src, T** dst, int W, in
}
float tmp[H][4] ALIGNED16;
- __m128 Rv;
- __m128 Tv, Tm2v, Tm3v;
- __m128 Bv, b1v, b2v, b3v;
- __m128 temp2W, temp2Wp1;
+ vfloat Rv;
+ vfloat Tv, Tm2v, Tm3v;
+ vfloat Bv, b1v, b2v, b3v;
+ vfloat temp2W, temp2Wp1;
Bv = F2V(B);
b1v = F2V(b1);
b2v = F2V(b2);
@@ -761,25 +762,53 @@ template void gaussVertical (T** src, T** dst, int W, int H, double sig
}
}
-template void gaussianBlur(T** src, T** dst, const int W, const int H, const double sigma, bool forceLowSigma = false)
+template void gaussianBlur(T** src, T** dst, const int W, const int H, const double sigma, T *buffer = NULL)
{
- double newSigma = sigma;
- if(forceLowSigma) {
- newSigma /= sqrt(2.0);
+ if(buffer) { // use iterated boxblur to approximate gaussian blur
+ // Compute ideal averaging filter width and number of iterations
+ int n = 1;
+ double wIdeal = sqrt((12 * sigma * sigma) + 1);
- if(newSigma < 0.6) { // barrier to avoid using simple gauss version for higher radius
- newSigma = sigma;
- forceLowSigma = false;
+ while(wIdeal > W || wIdeal > H) {
+ n++;
+ wIdeal = sqrt((12 * sigma * sigma / n) + 1);
}
- }
- gaussHorizontal (src, dst, W, H, newSigma);
- gaussVertical (dst, dst, W, H, newSigma);
+ if(n < 3) {
+ n = 3;
+ wIdeal = sqrt((12 * sigma * sigma / n) + 1);
+ } else if(n > 6) {
+ n = 6;
+ }
+
+ int wl = wIdeal;
+
+ if(wl % 2 == 0) {
+ wl--;
+ }
+
+ int wu = wl + 2;
+
+ double mIdeal = (12 * sigma * sigma - n * wl * wl - 4 * n * wl - 3 * n) / (-4 * wl - 4);
+ int m = round(mIdeal);
+
+ int sizes[n];
+
+ for(int i = 0; i < n; i++) {
+ sizes[i] = ((i < m ? wl : wu) - 1) / 2;
+ }
+
+ rtengine::boxblur(src, dst, buffer, sizes[0], sizes[0], W, H);
+
+ for(int i = 1; i < n; i++) {
+ rtengine::boxblur(dst, dst, buffer, sizes[i], sizes[i], W, H);
+ }
+
+ } else {
+ gaussHorizontal (src, dst, W, H, sigma);
+ gaussVertical (dst, dst, W, H, sigma);
- if(forceLowSigma) {
- gaussHorizontal (dst, dst, W, H, newSigma);
- gaussVertical (dst, dst, W, H, newSigma);
}
}
diff --git a/rtengine/improccoordinator.cc b/rtengine/improccoordinator.cc
index 23904ba1b..8389ec34e 100644
--- a/rtengine/improccoordinator.cc
+++ b/rtengine/improccoordinator.cc
@@ -242,7 +242,7 @@ void ImProcCoordinator::updatePreviewImage (int todo, Crop* cropCall)
}
}
- if (params.retinex.enabled) {
+ if ((todo & (M_RETINEX|M_INIT)) && params.retinex.enabled) {
bool dehacontlutili = false;
bool useHsl = false;
LUTf cdcurve (65536, 0);
diff --git a/rtengine/ipretinex.cc b/rtengine/ipretinex.cc
index 54d6888ea..54d5d3515 100644
--- a/rtengine/ipretinex.cc
+++ b/rtengine/ipretinex.cc
@@ -44,6 +44,8 @@
#include "rawimagesource.h"
#include "improcfun.h"
#include "opthelper.h"
+#include "StopWatch.h"
+
#define MAX_RETINEX_SCALES 8
#define clipretinex( val, minv, maxv ) (( val = (val < minv ? minv : val ) ) > maxv ? maxv : val )
@@ -304,24 +306,29 @@ void RawImageSource::MSR(float** luminance, float** originalLuminance, float **e
}
const float logBetaGain = xlogf(16384.f);
- const float pond = logBetaGain / (float) scal;
+ float pond = logBetaGain / (float) scal;
+
+ if(!useHslLin) {
+ pond /= log(elogt);
+ }
+
+ float *buffer = new float[W_L * H_L];;
#ifdef _OPENMP
#pragma omp parallel
#endif
{
for ( int scale = scal - 1; scale >= 0; scale-- ) {
- if(scale == scal - 1) { // probably large sigma. Use double gauss with sigma divided by sqrt(2.0)
- gaussianBlur (src, out, W_L, H_L, RetinexScales[scale], true);
+ if(scale == scal - 1) {
+ gaussianBlur (src, out, W_L, H_L, RetinexScales[scale], buffer);
} else { // reuse result of last iteration
- gaussianBlur (out, out, W_L, H_L, sqrtf(SQR(RetinexScales[scale]) - SQR(RetinexScales[scale + 1])));
+ gaussianBlur (out, out, W_L, H_L, sqrtf(SQR(RetinexScales[scale]) - SQR(RetinexScales[scale + 1])), buffer);
}
#ifdef __SSE2__
vfloat pondv = F2V(pond);
vfloat limMinv = F2V(ilimD);
vfloat limMaxv = F2V(limD);
- vfloat elogtv = F2V(elogt);
#endif
#ifdef _OPENMP
@@ -339,7 +346,7 @@ void RawImageSource::MSR(float** luminance, float** originalLuminance, float **e
}
} else {
for (; j < W_L - 3; j += 4) {
- _mm_storeu_ps(&luminance[i][j], LVFU(luminance[i][j]) + pondv * xlogf(LIMV(LVFU(src[i][j]) / LVFU(out[i][j]), limMinv, limMaxv) ) / xlogf(elogtv));
+ _mm_storeu_ps(&luminance[i][j], LVFU(luminance[i][j]) + pondv * xlogf(LIMV(LVFU(src[i][j]) / LVFU(out[i][j]), limMinv, limMaxv) ));
}
}
@@ -351,13 +358,13 @@ void RawImageSource::MSR(float** luminance, float** originalLuminance, float **e
}
} else {
for (; j < W_L; j++) {
- luminance[i][j] += pond * xlogf(LIM(src[i][j] / out[i][j], ilimD, limD)) / log(elogt); // /logt ?
+ luminance[i][j] += pond * xlogf(LIM(src[i][j] / out[i][j], ilimD, limD)); // /logt ?
}
}
}
}
}
-
+ delete [] buffer;
delete [] outBuffer;
delete [] srcBuffer;
diff --git a/rtengine/procparams.cc b/rtengine/procparams.cc
index eaf90d5c2..becd8932e 100644
--- a/rtengine/procparams.cc
+++ b/rtengine/procparams.cc
@@ -149,7 +149,7 @@ void RetinexParams::setDefaults()
offs = 0;
vart = 200;
limd = 8;
- highl = 10;
+ highl = 4;
baselog = 2.71828;
// grbl = 50;
retinexMethod = "high";
@@ -3795,8 +3795,8 @@ int ProcParams::load (Glib::ustring fname, ParamsEdited* pedited)
}
}
- if (keyFile.has_key ("Retinex", "Retinexmet")) {
- retinex.retinexMethod = keyFile.get_string ("Retinex", "Retinexmet");
+ if (keyFile.has_key ("Retinex", "RetinexMethod")) {
+ retinex.retinexMethod = keyFile.get_string ("Retinex", "RetinexMethod");
if (pedited) {
pedited->retinex.retinexMethod = true;
diff --git a/rtengine/rawimagesource.cc b/rtengine/rawimagesource.cc
index 2c0d8ad2f..32d91be64 100644
--- a/rtengine/rawimagesource.cc
+++ b/rtengine/rawimagesource.cc
@@ -2441,6 +2441,7 @@ void RawImageSource::retinex(ColorManagementParams cmp, RetinexParams deh, ToneC
}
}
}
+ rgbSourceModified = false; // tricky handling for Color propagation
t5.set();
diff --git a/rtengine/refreshmap.cc b/rtengine/refreshmap.cc
index 4180fd67a..3505da24f 100644
--- a/rtengine/refreshmap.cc
+++ b/rtengine/refreshmap.cc
@@ -433,25 +433,25 @@ int refreshmap[rtengine::NUMOFEVENTS] = {
DIRPYREQUALIZER, // EvWavedgeampli
DIRPYREQUALIZER, // EvWavlev3nois
DIRPYREQUALIZER, // EvWavNPmet
- ALLNORAW, // EvretinexMethod
- ALLNORAW, // EvLneigh
- ALLNORAW, // EvLgain
- ALLNORAW, // EvLoffs
- ALLNORAW, // EvLstr
- ALLNORAW, // EvLscal
- ALLNORAW, // EvLvart
- ALLNORAW, // EvLCDCurve
- ALLNORAW, // EvRetinextransmission
+ DEMOSAIC, // EvretinexMethod
+ RETINEX, // EvLneigh
+ RETINEX, // EvLgain
+ RETINEX, // EvLoffs
+ RETINEX, // EvLstr
+ RETINEX, // EvLscal
+ RETINEX, // EvLvart
+ RETINEX, // EvLCDCurve
+ RETINEX, // EvRetinextransmission
DEMOSAIC, // EvRetinexEnabled
- ALLNORAW, // EvRetinexmedianmap
- ALLNORAW, // EvLlimd
+ RETINEX, // EvRetinexmedianmap
+ RETINEX, // EvLlimd
DEMOSAIC, // Evretinexcolorspace
- ALLNORAW, // EvLCDHCurve
- DEMOSAIC, // Evretinexgamma
- DEMOSAIC, // EvLgam
- DEMOSAIC, // EvLslope
- ALLNORAW, // EvLhighl
- DEMOSAIC, // EvLbaselog
+ RETINEX, // EvLCDHCurve
+ DEMOSAIC, // Evretinexgamma
+ DEMOSAIC, // EvLgam
+ DEMOSAIC, // EvLslope
+ RETINEX, // EvLhighl
+ DEMOSAIC, // EvLbaselog
// DEMOSAIC, // EvLgrbl
DEMOSAIC // EvRetinexlhcurve
};
diff --git a/rtengine/refreshmap.h b/rtengine/refreshmap.h
index 16c05654a..e24d0c422 100644
--- a/rtengine/refreshmap.h
+++ b/rtengine/refreshmap.h
@@ -29,6 +29,7 @@
// Elementary functions that can be done to
// the preview image when an event occurs
+#define M_RETINEX (1<<12)
#define M_CROP (1<<11)
#define M_PREPROC (1<<10)
#define M_RAW (1<<9)
@@ -47,7 +48,6 @@
#define FIRST (M_PREPROC|M_RAW|M_INIT|M_LINDENOISE|M_TRANSFORM|M_BLURMAP|M_AUTOEXP|M_RGBCURVE|M_LUMACURVE|M_LUMINANCE|M_COLOR) // without HIGHQUAL
#define ALL (M_PREPROC|M_RAW|M_INIT|M_LINDENOISE|M_TRANSFORM|M_BLURMAP|M_AUTOEXP|M_RGBCURVE|M_LUMACURVE|M_LUMINANCE|M_COLOR) // without HIGHQUAL
#define TRANSFORM (M_TRANSFORM|M_BLURMAP|M_AUTOEXP|M_RGBCURVE|M_LUMACURVE|M_LUMINANCE|M_COLOR)
-#define RETINEX (M_BLURMAP|M_AUTOEXP|M_RGBCURVE|M_LUMACURVE|M_LUMINANCE|M_COLOR)
#define AUTOEXP (M_AUTOEXP|M_RGBCURVE|M_LUMACURVE|M_LUMINANCE|M_COLOR)
#define RGBCURVE (M_RGBCURVE|M_LUMACURVE|M_LUMINANCE|M_COLOR)
#define LUMINANCECURVE (M_LUMACURVE|M_LUMINANCE)
@@ -69,6 +69,7 @@
#define GAMMA (M_COLOR|M_LUMINANCE)
#define MINUPDATE M_MINUPDATE
#define ALLNORAW (M_INIT|M_LINDENOISE|M_TRANSFORM|M_BLURMAP|M_AUTOEXP|M_RGBCURVE|M_LUMACURVE|M_LUMINANCE|M_COLOR)
+#define RETINEX (M_RETINEX|ALLNORAW)
extern int refreshmap[];
#endif
diff --git a/rtgui/addsetids.h b/rtgui/addsetids.h
index 5db492db3..244c22946 100644
--- a/rtgui/addsetids.h
+++ b/rtgui/addsetids.h
@@ -94,7 +94,7 @@
#define ADDSET_WA_THRESHOLD2 86
#define ADDSET_WA_CHRO 87
#define ADDSET_WA_CHROMA 88
-#define ADDSET_WA_CONTRAST 89
+#define ADDSET_WA_CONTRAST 89
#define ADDSET_WA_RESCON 90
#define ADDSET_WA_RESCONH 91
#define ADDSET_WA_RESCHRO 92
@@ -107,17 +107,16 @@
#define ADDSET_WA_EDGEDETECTTHR2 99
#define ADDSET_WA_TMRS 100
#define ADDSET_WA_GAMMA 101
-#define ADDSET_RETI_STR 102
-#define ADDSET_RETI_SCAL 103
-#define ADDSET_RETI_NEIGH 104
-#define ADDSET_RETI_LIMD 105
-#define ADDSET_RETI_GAIN 106
-#define ADDSET_RETI_OFFS 107
-#define ADDSET_RETI_VART 108
-#define ADDSET_RETI_GAM 109
-#define ADDSET_RETI_SLO 110
+#define ADDSET_RETI_STR 102
+#define ADDSET_RETI_NEIGH 103
+#define ADDSET_RETI_LIMD 104
+#define ADDSET_RETI_GAIN 105
+#define ADDSET_RETI_OFFS 106
+#define ADDSET_RETI_VART 107
+#define ADDSET_RETI_GAM 108
+#define ADDSET_RETI_SLO 109
// When adding items, make sure to update ADDSET_PARAM_NUM
-#define ADDSET_PARAM_NUM 111 // THIS IS USED AS A DELIMITER!!
+#define ADDSET_PARAM_NUM 110 // THIS IS USED AS A DELIMITER!!
#endif
diff --git a/rtgui/batchtoolpanelcoord.cc b/rtgui/batchtoolpanelcoord.cc
index e1d78a19f..9a4e15b89 100644
--- a/rtgui/batchtoolpanelcoord.cc
+++ b/rtgui/batchtoolpanelcoord.cc
@@ -167,7 +167,7 @@ void BatchToolPanelCoordinator::initSession ()
blackwhite->setAdjusterBehavior (false, false);
colortoning->setAdjusterBehavior (false, false, false, false, false);
filmSimulation->setAdjusterBehavior(false);
- retinex->setAdjusterBehavior (false, false, false, false, false, false, false, false, false);
+ retinex->setAdjusterBehavior (false, false, false, false, false, false, false, false);
shadowshighlights->setAdjusterBehavior (false, false, false);
dirpyrequalizer->setAdjusterBehavior (false, false, false);
@@ -204,7 +204,7 @@ void BatchToolPanelCoordinator::initSession ()
// colortoning->setAdjusterBehavior (options.baBehav[ADDSET_COLORTONING_SPLIT], options.baBehav[ADDSET_COLORTONING_SATTHRESHOLD], options.baBehav[ADDSET_COLORTONING_SATOPACITY], options.baBehav[ADDSET_COLORTONING_STRPROTECT], options.baBehav[ADDSET_COLORTONING_BALANCE]);
colortoning->setAdjusterBehavior (options.baBehav[ADDSET_COLORTONING_SPLIT], options.baBehav[ADDSET_COLORTONING_SATTHRESHOLD], options.baBehav[ADDSET_COLORTONING_SATOPACITY], options.baBehav[ADDSET_COLORTONING_STRENGTH], options.baBehav[ADDSET_COLORTONING_BALANCE]);
filmSimulation->setAdjusterBehavior(options.baBehav[ADDSET_FILMSIMULATION_STRENGTH]);
- retinex->setAdjusterBehavior (options.baBehav[ADDSET_RETI_STR], options.baBehav[ADDSET_RETI_SCAL], options.baBehav[ADDSET_RETI_NEIGH], options.baBehav[ADDSET_RETI_LIMD], options.baBehav[ADDSET_RETI_GAIN], options.baBehav[ADDSET_RETI_OFFS], options.baBehav[ADDSET_RETI_VART], options.baBehav[ADDSET_RETI_GAM], options.baBehav[ADDSET_RETI_SLO]);
+ retinex->setAdjusterBehavior (options.baBehav[ADDSET_RETI_STR], options.baBehav[ADDSET_RETI_NEIGH], options.baBehav[ADDSET_RETI_LIMD], options.baBehav[ADDSET_RETI_GAIN], options.baBehav[ADDSET_RETI_OFFS], options.baBehav[ADDSET_RETI_VART], options.baBehav[ADDSET_RETI_GAM], options.baBehav[ADDSET_RETI_SLO]);
chmixer->setAdjusterBehavior (options.baBehav[ADDSET_CHMIXER] );
blackwhite->setAdjusterBehavior (options.baBehav[ADDSET_BLACKWHITE_HUES], options.baBehav[ADDSET_BLACKWHITE_GAMMA]);
@@ -582,10 +582,6 @@ void BatchToolPanelCoordinator::initSession ()
pparams.retinex.str = 0;
}
- if (options.baBehav[ADDSET_RETI_SCAL]) {
- pparams.retinex.scal = 0;
- }
-
if (options.baBehav[ADDSET_RETI_NEIGH]) {
pparams.retinex.neigh = 0;
}
diff --git a/rtgui/main.cc b/rtgui/main.cc
index 25c4e9bdb..2b7a73d55 100644
--- a/rtgui/main.cc
+++ b/rtgui/main.cc
@@ -615,10 +615,13 @@ int processLineParams( int argc, char **argv )
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: 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;
- std::cout << " 3 = Best quality: 1x1, 1x1, 1x1 (4:4:4)" << std::endl;
+ std::cout << " -js<1-3> Specify the JPEG chroma subsampling parameter, where:" << std::endl;
+ std::cout << " 1 = Best compression: 2x2, 1x1, 1x1 (4:2:0)" << std::endl;
+ std::cout << " Chroma halved vertically and horizontally." << std::endl;
+ std::cout << " 2 = Balanced: 2x1, 1x1, 1x1 (4:2:2)" << std::endl;
+ std::cout << " Chroma halved horizontally." << std::endl;
+ std::cout << " 3 = Best quality: 1x1, 1x1, 1x1 (4:4:4)" << std::endl;
+ std::cout << " No chroma subsampling." << std::endl;
std::cout << " -b<8|16> Specify bit depth per channel (only applies to TIFF and PNG output)." << std::endl;
std::cout << " -t[z] Specify output to be TIFF (16-bit if -b8 is not set)." << std::endl;
std::cout << " Uncompressed by default, or ZIP compression with 'z'" << std::endl;
diff --git a/rtgui/options.cc b/rtgui/options.cc
index 84f860123..160ea168a 100644
--- a/rtgui/options.cc
+++ b/rtgui/options.cc
@@ -599,7 +599,6 @@ void Options::setDefaults ()
0, //ADDSET_WA_TMRS
0, //ADDSET_WA_GAMMA
0, //ADDSET_RETI_STR
- 0, //ADDSET_RETI_SCAL
0, //ADDSET_RETI_NEIGH
0, //ADDSET_RETI_LIMD
0, //ADDSET_RETI_GAIN
diff --git a/rtgui/paramsedited.cc b/rtgui/paramsedited.cc
index 08433357c..ac2fe6523 100644
--- a/rtgui/paramsedited.cc
+++ b/rtgui/paramsedited.cc
@@ -1082,9 +1082,9 @@ void ParamsEdited::combine (rtengine::procparams::ProcParams& toEdit, const rten
toEdit.retinex.str = dontforceSet && options.baBehav[ADDSET_RETI_STR] ? toEdit.retinex.str + mods.retinex.str : mods.retinex.str;
}
- if (retinex.scal) {
- toEdit.retinex.scal = dontforceSet && options.baBehav[ADDSET_RETI_SCAL] ? toEdit.retinex.scal + mods.retinex.scal : mods.retinex.scal;
- }
+// if (retinex.scal) {
+// toEdit.retinex.scal = dontforceSet && options.baBehav[ADDSET_RETI_SCAL] ? toEdit.retinex.scal + mods.retinex.scal : mods.retinex.scal;
+// }
if (retinex.medianmap) {
toEdit.retinex.medianmap = mods.retinex.medianmap;
@@ -2702,4 +2702,4 @@ bool LensProfParamsEdited::isUnchanged() const
bool RetinexParamsEdited::isUnchanged() const
{
return enabled && retinexcolorspace && gammaretinex && gam && slope;
-}
\ No newline at end of file
+}
diff --git a/rtgui/preferences.cc b/rtgui/preferences.cc
index 2dfc7d29f..7a9710e33 100644
--- a/rtgui/preferences.cc
+++ b/rtgui/preferences.cc
@@ -172,13 +172,12 @@ Gtk::Widget* Preferences::getBatchProcPanel ()
mi->set_value (behavColumns.label, M("TP_RETINEX_LABEL"));
appendBehavList (mi, M("TP_RETINEX_STRENGTH"), ADDSET_RETI_STR, false);
appendBehavList (mi, M("TP_RETINEX_NEIGHBOR"), ADDSET_RETI_NEIGH, false);
+ appendBehavList (mi, M("TP_RETINEX_VARIANCE"), ADDSET_RETI_VART, false);
appendBehavList (mi, M("TP_RETINEX_GAMMA"), ADDSET_RETI_GAM, false);
appendBehavList (mi, M("TP_RETINEX_SLOPE"), ADDSET_RETI_SLO, false);
- appendBehavList (mi, M("TP_RETINEX_SCALES"), ADDSET_RETI_SCAL, false);
appendBehavList (mi, M("TP_RETINEX_GAIN"), ADDSET_RETI_GAIN, false);
appendBehavList (mi, M("TP_RETINEX_OFFSET"), ADDSET_RETI_OFFS, false);
appendBehavList (mi, M("TP_RETINEX_THRESHOLD"), ADDSET_RETI_LIMD, false);
- appendBehavList (mi, M("TP_RETINEX_VARIANCE"), ADDSET_RETI_VART, false);
mi = behModel->append ();
mi->set_value (behavColumns.label, M("TP_SHADOWSHLIGHTS_LABEL"));
diff --git a/rtgui/retinex.cc b/rtgui/retinex.cc
index fe888f63e..69907cc0a 100644
--- a/rtgui/retinex.cc
+++ b/rtgui/retinex.cc
@@ -112,12 +112,12 @@ Retinex::Retinex () : FoldableToolPanel(this, "retinex", M("TP_RETINEX_LABEL"),
gammaretinexConn = gammaretinex->signal_changed().connect ( sigc::mem_fun(*this, &Retinex::gammaretinexChanged) );
gammaretinex->set_tooltip_markup (M("TP_RETINEX_GAMMA_TOOLTIP"));
- gam = Gtk::manage (new Adjuster (M("TP_RETINEX_GAMMA"), 0.6, 3.0, 0.01, 1.30));
+ gam = Gtk::manage (new Adjuster (M("TP_RETINEX_FREEGAMMA"), 0.6, 3.0, 0.01, 1.30));
slope = Gtk::manage (new Adjuster (M("TP_RETINEX_SLOPE"), 1., 20., 0.1, 3.));
str = Gtk::manage (new Adjuster (M("TP_RETINEX_STRENGTH"), 0, 100., 1., 20.));
neigh = Gtk::manage (new Adjuster (M("TP_RETINEX_NEIGHBOR"), 6, 100., 1., 80.));
- highl = Gtk::manage (new Adjuster (M("TP_RETINEX_HIGHLIGHT"), 1, 100, 1, 10));
+ highl = Gtk::manage (new Adjuster (M("TP_RETINEX_HIGHLIGHT"), 1, 20, 1, 4));
highl->set_tooltip_markup (M("TP_RETINEX_HIGHLIGHT_TOOLTIP"));
vart = Gtk::manage (new Adjuster (M("TP_RETINEX_VARIANCE"), 50, 500, 1, 200));
vart->set_tooltip_markup (M("TP_RETINEX_VARIANCE_TOOLTIP"));
@@ -808,11 +808,10 @@ void Retinex::setDefaults (const ProcParams* defParams, const ParamsEdited* pedi
}
}
-void Retinex::setAdjusterBehavior (bool strAdd, bool neighAdd, bool scalAdd, bool limdAdd, bool gainAdd, bool offsAdd, bool vartAdd, bool gamAdd, bool slopeAdd)
+void Retinex::setAdjusterBehavior (bool strAdd, bool neighAdd, bool limdAdd, bool gainAdd, bool offsAdd, bool vartAdd, bool gamAdd, bool slopeAdd)
{
str->setAddMode(strAdd);
neigh->setAddMode(neighAdd);
- scal->setAddMode(scalAdd);
limd->setAddMode(limdAdd);
gain->setAddMode(gainAdd);
offs->setAddMode(offsAdd);
diff --git a/rtgui/retinex.h b/rtgui/retinex.h
index a9b462808..59001ce18 100644
--- a/rtgui/retinex.h
+++ b/rtgui/retinex.h
@@ -97,7 +97,7 @@ public:
void ColorSpaceUpdateUI();
void writeOptions (std::vector &tpOpen);
void updateToolState (std::vector &tpOpen);
- void setAdjusterBehavior (bool strAdd, bool neighAdd, bool scalAdd, bool limdAdd, bool gainAdd, bool offsAdd, bool vartAdd, bool gamAdd, bool slopeAdd);
+ void setAdjusterBehavior (bool strAdd, bool neighAdd, bool limdAdd, bool gainAdd, bool offsAdd, bool vartAdd, bool gamAdd, bool slopeAdd);
void updateCurveBackgroundHistogram (LUTu & histToneCurve, LUTu & histLCurve, LUTu & histCCurve,/* LUTu & histCLurve, LUTu & histLLCurve,*/ LUTu & histLCAM, LUTu & histCCAM, LUTu & histRed, LUTu & histGreen, LUTu & histBlue, LUTu & histLuma, LUTu & histLRETI);
virtual void colorForValue (double valX, double valY, enum ColorCaller::ElemType elemType, int callerId, ColorCaller* caller);