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

Fixed crash by changing level with preview size

Browse Source
This commit is contained in:
Desmis
2020-10-12 08:35:09 +02:00
parent 0511458502
commit 8e9e397130
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
rtengine/ipwavelet.cc
View File

@@ -669,7 +669,7 @@ void ImProcFunctions::ip_wavelet(LabImage * lab, LabImage * dst, int kall, const
maxlevelcrop = 6;
}
if (minwin < 64) {
if (minwin * skip < 64) {
maxlevelcrop = 5;
}
@@ -1054,7 +1054,6 @@ void ImProcFunctions::ip_wavelet(LabImage * lab, LabImage * dst, int kall, const
levwavL = 6; //to allow edge and denoise => I always allocate 3 (4) levels..because if user select wavelet it is to do something !!
}
levwavL = rtengine::min(maxlevelcrop, levwavL);
/*
if(cp.denoicurvh || cp.levdenhigh > 0.01f) {
@@ -1066,12 +1065,13 @@ void ImProcFunctions::ip_wavelet(LabImage * lab, LabImage * dst, int kall, const
levwavL = levwav;
}
bool usechrom = cp.chromfi > 0.f || cp.chromco > 0.f;
levwavL = rtengine::min(maxlevelcrop, levwavL);
if (settings->verbose) {
printf("Level decomp L=%i\n", levwavL);
}
bool usechrom = cp.chromfi > 0.f || cp.chromco > 0.f;
if (levwavL > 0) {
const std::unique_ptr<wavelet_decomposition> Ldecomp(new wavelet_decomposition(labco->data, labco->W, labco->H, levwavL, 1, skip, rtengine::max(1, wavNestedLevels), DaubLen));
// const std::unique_ptr<wavelet_decomposition> Ldecomp2(new wavelet_decomposition(labco->data, labco->W, labco->H, levwavL, 1, skip, rtengine::max(1, wavNestedLevels), DaubLen));
@@ -1773,6 +1773,7 @@ void ImProcFunctions::ip_wavelet(LabImage * lab, LabImage * dst, int kall, const
}
}
levwava = rtengine::min(maxlevelcrop, levwava);
if (settings->verbose) {
printf("Leval decomp a=%i\n", levwava);
}
@@ -1809,11 +1810,12 @@ void ImProcFunctions::ip_wavelet(LabImage * lab, LabImage * dst, int kall, const
}
}
levwavb = rtengine::min(maxlevelcrop, levwavb);
if (settings->verbose) {
printf("Leval decomp b=%i\n", levwavb);
}
if (levwavb > 0) {
const std::unique_ptr<wavelet_decomposition> bdecomp(new wavelet_decomposition(labco->data + 2 * datalen, labco->W, labco->H, levwavb, 1, skip, rtengine::max(1, wavNestedLevels), DaubLen));