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

Fixed crash in local retinex

Browse Source
This commit is contained in:
Desmis
2019-01-26 11:51:44 +01:00
parent 63f6c26f70
commit a9fd4f0fed
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
rtengine/ipretinex.cc
View File

@@ -53,7 +53,8 @@
namespace namespace
{ {
void retinex_scales(float* scales, int nscales, int mode, int s, float high) void retinex_scales(float* scales, int nscales, int mode, int s, float high)
{ { if(s < 3) s = 3;//to avoid crash in MSRlocal if nei small
if (nscales == 1) { if (nscales == 1) {
scales[0] = (float)s / 2.f; scales[0] = (float)s / 2.f;
} else if (nscales == 2) { } else if (nscales == 2) {
@@ -851,6 +852,7 @@ void ImProcFunctions::MSRLocal(int sp, float** luminance, float** templ, const f
constexpr auto maxRetinexScales = 8; constexpr auto maxRetinexScales = 8;
float RetinexScales[maxRetinexScales]; float RetinexScales[maxRetinexScales];
// retinex_scales(RetinexScales, scal, moderetinex, nei, high);
retinex_scales(RetinexScales, scal, moderetinex, nei, high); retinex_scales(RetinexScales, scal, moderetinex, nei, high);

2
rtgui/locallab.cc
View File

@@ -110,7 +110,7 @@ Locallab::Locallab():
// Retinex // Retinex
str(Gtk::manage(new Adjuster(M("TP_LOCALLAB_STR"), 0, 100, 1, 0))), str(Gtk::manage(new Adjuster(M("TP_LOCALLAB_STR"), 0, 100, 1, 0))),
chrrt(Gtk::manage(new Adjuster(M("TP_LOCALLAB_CHRRT"), 0, 100, 1, 0))), chrrt(Gtk::manage(new Adjuster(M("TP_LOCALLAB_CHRRT"), 0, 100, 1, 0))),
neigh(Gtk::manage(new Adjuster(M("TP_LOCALLAB_NEIGH"), -100, 150, 1, 100))),//14, 150, 1, 50))), neigh(Gtk::manage(new Adjuster(M("TP_LOCALLAB_NEIGH"), 14, 200, 1, 50))),//14, 150, 1, 50))),
vart(Gtk::manage(new Adjuster(M("TP_LOCALLAB_VART"), 50, 500, 1, 200))), vart(Gtk::manage(new Adjuster(M("TP_LOCALLAB_VART"), 50, 500, 1, 200))),
dehaz(Gtk::manage(new Adjuster(M("TP_LOCALLAB_DEHAZ"), 0, 100, 1, 0))), dehaz(Gtk::manage(new Adjuster(M("TP_LOCALLAB_DEHAZ"), 0, 100, 1, 0))),
sensih(Gtk::manage(new Adjuster(M("TP_LOCALLAB_SENSIH"), 0, 100, 1, 19))), sensih(Gtk::manage(new Adjuster(M("TP_LOCALLAB_SENSIH"), 0, 100, 1, 19))),