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

merge wirh Dev

Browse Source
This commit is contained in:
Desmis
2017-10-12 17:49:35 +02:00
parent baa2d91ee6 f38680b0f8
commit cffb29d17b
4 changed files with 13 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
rtdata/languages/Francais
View File

@@ -1173,8 +1173,8 @@ SAVEDLG_SUBSAMP_TOOLTIP;Meilleurs compression:\nJ:a:b 4:2:0\nh/v 2/2\nChroma div
SAVEDLG_TIFFUNCOMPRESSED;TIFF non compressé SAVEDLG_TIFFUNCOMPRESSED;TIFF non compressé
SAVEDLG_WARNFILENAME;Le fichier sera nommé SAVEDLG_WARNFILENAME;Le fichier sera nommé
SHCSELECTOR_TOOLTIP;Cliquez le bouton droit de la souris\npour réinitialiser la position de ces 3 curseurs SHCSELECTOR_TOOLTIP;Cliquez le bouton droit de la souris\npour réinitialiser la position de ces 3 curseurs
SOFTPROOF_GAMUTCHECK_TOOLTIP;Si activé, indique en gris les pixels dont la couleurs est en dehors du gamut du profil de sortie SOFTPROOF_GAMUTCHECK_TOOLTIP;Si activé, indique en gris les pixels dont la couleurs est en dehors du gamut du profil Imprimante
SOFTPROOF_TOOLTIP;Épreuvage écran\nSi activé, simule le rendu généré par le profile de sortie de l'outil ICM. Particulièrement utile pour simuler le rendu en sortie d'imprimante. SOFTPROOF_TOOLTIP;Épreuvage écran\nSi activé, vous permet de simuler le rendu obtenu par votre imprimante en utilisant le profil Imprimante réglé dans Préférences > Gestion des couleurs.
THRESHOLDSELECTOR_B;Bas THRESHOLDSELECTOR_B;Bas
THRESHOLDSELECTOR_BL;Bas-gauche THRESHOLDSELECTOR_BL;Bas-gauche
THRESHOLDSELECTOR_BR;Bas-droite THRESHOLDSELECTOR_BR;Bas-droite

4
rtdata/languages/default
View File

@@ -1324,8 +1324,8 @@ SAVEDLG_SUBSAMP_TOOLTIP;Best compression:\nJ:a:b 4:2:0\nh/v 2/2\nChroma halved h
SAVEDLG_TIFFUNCOMPRESSED;Uncompressed TIFF SAVEDLG_TIFFUNCOMPRESSED;Uncompressed TIFF
SAVEDLG_WARNFILENAME;File will be named SAVEDLG_WARNFILENAME;File will be named
SHCSELECTOR_TOOLTIP;Click right mouse button to reset the position of those 3 sliders. SHCSELECTOR_TOOLTIP;Click right mouse button to reset the position of those 3 sliders.
SOFTPROOF_GAMUTCHECK_TOOLTIP;If active, indicates in grey the pixels which have out of gamut colors from the output profile. SOFTPROOF_GAMUTCHECK_TOOLTIP;If active, indicates in grey the pixels which have out of gamut colors from the Printer profile.
SOFTPROOF_TOOLTIP;Soft-proofing\nIf active, let you simulate de rendering generated by the output profile of the ICM tool. Most useful for simulating printing outputs. SOFTPROOF_TOOLTIP;Soft-proofing\nIf active, let you simulate the printer's output by using the Printer profile set in Preferences > Color Management.
THRESHOLDSELECTOR_B;Bottom THRESHOLDSELECTOR_B;Bottom
THRESHOLDSELECTOR_BL;Bottom-left THRESHOLDSELECTOR_BL;Bottom-left
THRESHOLDSELECTOR_BR;Bottom-right THRESHOLDSELECTOR_BR;Bottom-right

4
rtengine/iccstore.cc
View File

@@ -501,7 +501,9 @@ public:
) )
||( ||(
type==ICCStore::ProfileType::OUTPUT type==ICCStore::ProfileType::OUTPUT
&& (cmsGetDeviceClass(profile.second) == cmsSigDisplayClass || cmsGetDeviceClass(profile.second) == cmsSigOutputClass) && (cmsGetDeviceClass(profile.second) == cmsSigDisplayClass
|| cmsGetDeviceClass(profile.second) == cmsSigInputClass
|| cmsGetDeviceClass(profile.second) == cmsSigOutputClass)
&& cmsGetColorSpace(profile.second) == cmsSigRgbData && cmsGetColorSpace(profile.second) == cmsSigRgbData
) )
) { ) {

18
rtengine/ipwavelet.cc
View File

@@ -669,12 +669,12 @@ SSEFUNCTION void ImProcFunctions::ip_wavelet (LabImage * lab, LabImage * dst, in
#pragma omp parallel num_threads(numthreads) #pragma omp parallel num_threads(numthreads)
#endif #endif
{ {
float *mean = new float [9]; float mean[10];
float *meanN = new float [9]; float meanN[10];
float *sigma = new float [9]; float sigma[10];
float *sigmaN = new float [9]; float sigmaN[10];
float *MaxP = new float [9]; float MaxP[10];
float *MaxN = new float [9]; float MaxN[10];
float** varhue = new float*[tileheight]; float** varhue = new float*[tileheight];
@@ -1247,12 +1247,6 @@ SSEFUNCTION void ImProcFunctions::ip_wavelet (LabImage * lab, LabImage * dst, in
delete [] varchro; delete [] varchro;
delete [] mean;
delete [] meanN;
delete [] sigma;
delete [] sigmaN;
delete [] MaxP;
delete [] MaxN;
} }
#ifdef _RT_NESTED_OPENMP #ifdef _RT_NESTED_OPENMP
omp_set_nested (oldNested); omp_set_nested (oldNested);