From f38b271d74c9f78c8dd538e153bad57243dca98b Mon Sep 17 00:00:00 2001 From: heckflosse Date: Tue, 10 Oct 2017 15:44:27 +0200 Subject: [PATCH 1/3] fix heap-buffer-overflow in wavelet, Detected by AddressSanitizer. #4127 --- rtengine/ipwavelet.cc | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/rtengine/ipwavelet.cc b/rtengine/ipwavelet.cc index a5c9b6d7a..dd2a32e10 100644 --- a/rtengine/ipwavelet.cc +++ b/rtengine/ipwavelet.cc @@ -669,12 +669,12 @@ SSEFUNCTION void ImProcFunctions::ip_wavelet(LabImage * lab, LabImage * dst, int #pragma omp parallel num_threads(numthreads) #endif { - float *mean = new float [9]; - float *meanN = new float [9]; - float *sigma = new float [9]; - float *sigmaN = new float [9]; - float *MaxP = new float [9]; - float *MaxN = new float [9]; + float mean[10]; + float meanN[10]; + float sigma[10]; + float sigmaN[10]; + float MaxP[10]; + float MaxN[10]; float** varhue = new float*[tileheight]; @@ -1247,12 +1247,6 @@ SSEFUNCTION void ImProcFunctions::ip_wavelet(LabImage * lab, LabImage * dst, int delete [] varchro; - delete [] mean; - delete [] meanN; - delete [] sigma; - delete [] sigmaN; - delete [] MaxP; - delete [] MaxN; } #ifdef _RT_NESTED_OPENMP omp_set_nested(oldNested); From dcd2922167d6649549ac6c0e5cf81171d4dbe834 Mon Sep 17 00:00:00 2001 From: Hombre57 Date: Tue, 10 Oct 2017 23:03:57 +0200 Subject: [PATCH 2/3] Let users select RGB Input ICC profiles for output profiles as requested there https://discuss.pixls.us/t/rawtherapee-restriction-on-user-chosen-output-profile/5301 (no issue) --- rtengine/iccstore.cc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/rtengine/iccstore.cc b/rtengine/iccstore.cc index 49ff4790e..dc4fe6ffb 100644 --- a/rtengine/iccstore.cc +++ b/rtengine/iccstore.cc @@ -501,7 +501,9 @@ public: ) ||( 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 ) ) { From f38680b0f8f8dc0f6aa3e6a68af4ab9220d4144a Mon Sep 17 00:00:00 2001 From: Hombre57 Date: Tue, 10 Oct 2017 23:42:59 +0200 Subject: [PATCH 3/3] Updating misleading tooltips of Soft-proofing buttons (no issue) --- rtdata/languages/Francais | 4 ++-- rtdata/languages/default | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/rtdata/languages/Francais b/rtdata/languages/Francais index e7fdc8592..6c581d55b 100644 --- a/rtdata/languages/Francais +++ b/rtdata/languages/Francais @@ -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_WARNFILENAME;Le fichier sera nommé 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_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_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é, 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_BL;Bas-gauche THRESHOLDSELECTOR_BR;Bas-droite diff --git a/rtdata/languages/default b/rtdata/languages/default index 8310c284e..4095fadfb 100644 --- a/rtdata/languages/default +++ b/rtdata/languages/default @@ -1200,8 +1200,8 @@ SAVEDLG_SUBSAMP_TOOLTIP;Best compression:\nJ:a:b 4:2:0\nh/v 2/2\nChroma halved h SAVEDLG_TIFFUNCOMPRESSED;Uncompressed TIFF SAVEDLG_WARNFILENAME;File will be named 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_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_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 the printer's output by using the Printer profile set in Preferences > Color Management. THRESHOLDSELECTOR_B;Bottom THRESHOLDSELECTOR_BL;Bottom-left THRESHOLDSELECTOR_BR;Bottom-right