liz/rawTherapee
liz/rawTherapee
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into retinexgausstest

Browse Source
This commit is contained in:
Beep6581 2015-10-31 21:45:34 +01:00
commit 71303fd51c
40 changed files with 61 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
rtdata/languages/Catala
View File

@ -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: <b>-</b>
!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

2
rtdata/languages/Chinese (Simplified)
View File

@ -1392,7 +1392,7 @@ ZOOMPANEL_ZOOMOUT;缩放拉远\n快捷键: <b>-</b>
!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

2
rtdata/languages/Chinese (Traditional)
View File

@ -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.

2
rtdata/languages/Czech
View File

@ -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: <b>-</b>
!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

2
rtdata/languages/Dansk
View File

@ -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.

2
rtdata/languages/Deutsch
View File

@ -1106,7 +1106,6 @@ 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_TIFFUNCOMPRESSED;Unkomprimiertes TIFF
SAVEDLG_WARNFILENAME;Die Datei wird gespeichert als
SHCSELECTOR_TOOLTIP;Um die 3 Regler zurückzusetzen, rechte Maustaste klicken.
@ -1938,6 +1937,7 @@ ZOOMPANEL_ZOOMOUT;Herauszoomen\nTaste: <b>-</b>
!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

2
rtdata/languages/English (UK)
View File

@ -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.

2
rtdata/languages/English (US)
View File

@ -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.

2
rtdata/languages/Espanol
View File

@ -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: <b>-</b>
!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

2
rtdata/languages/Euskara
View File

@ -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.

2
rtdata/languages/Francais
View File

@ -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: <b>-</b>
!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

2
rtdata/languages/Greek
View File

@ -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.

2
rtdata/languages/Hebrew
View File

@ -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.

2
rtdata/languages/Italiano
View File

@ -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: <b>-</b>
!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

2
rtdata/languages/Japanese
View File

@ -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ショートカット: <b>-</b>
!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

2
rtdata/languages/Latvian
View File

@ -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.

2
rtdata/languages/Magyar
View File

@ -1368,7 +1368,7 @@ ZOOMPANEL_ZOOMOUT;Kicsinyítés <b>-</b>
!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

2
rtdata/languages/Nederlands
View File

@ -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: <b>-</b>
!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

2
rtdata/languages/Norsk BM
View File

@ -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.

2
rtdata/languages/Polish
View File

@ -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: <b>-</b>
!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

2
rtdata/languages/Polish (Latin Characters)
View File

@ -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: <b>-</b>
!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

2
rtdata/languages/Portugues (Brasil)
View File

@ -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.

2
rtdata/languages/Russian
View File

@ -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;Удалить <b>-</b>
!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

2
rtdata/languages/Serbian (Cyrilic Characters)
View File

@ -1308,7 +1308,7 @@ ZOOMPANEL_ZOOMOUT;Умањује приказ слике <b>-</b>
!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

2
rtdata/languages/Serbian (Latin Characters)
View File

@ -1308,7 +1308,7 @@ ZOOMPANEL_ZOOMOUT;Umanjuje prikaz slike <b>-</b>
!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

2
rtdata/languages/Slovak
View File

@ -1251,7 +1251,7 @@ ZOOMPANEL_ZOOMOUT;Oddialiť <b>-</b>
!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

2
rtdata/languages/Suomi
View File

@ -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

2
rtdata/languages/Swedish
View File

@ -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: <b>-</b>
!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

2
rtdata/languages/Turkish
View File

@ -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

6
rtdata/languages/default
View File

@ -1107,7 +1107,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,7 +1640,7 @@ 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_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_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

4
rtengine/procparams.cc
View File

@ -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;

2
rtengine/refreshmap.cc
View File

@ -433,7 +433,7 @@ int refreshmap[rtengine::NUMOFEVENTS] = {
DIRPYREQUALIZER, // EvWavedgeampli
DIRPYREQUALIZER, // EvWavlev3nois
DIRPYREQUALIZER, // EvWavNPmet
ALLNORAW, // EvretinexMethod
DEMOSAIC, // EvretinexMethod
ALLNORAW, // EvLneigh
ALLNORAW, // EvLgain
ALLNORAW, // EvLoffs

21
rtgui/addsetids.h
View File

@ -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

8
rtgui/batchtoolpanelcoord.cc
View File

@ -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;
}

11
rtgui/main.cc
View File

@ -567,10 +567,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;

1
rtgui/options.cc
View File

@ -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

6
rtgui/paramsedited.cc
View File

@ -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;

3
rtgui/preferences.cc
View File

@ -174,13 +174,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"));

3
rtgui/retinex.cc
View File

@ -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);

2
rtgui/retinex.h
View File

@ -97,7 +97,7 @@ public:
void ColorSpaceUpdateUI();
void writeOptions (std::vector<int> &tpOpen);
void updateToolState (std::vector<int> &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);