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

Peak memory usage of Wavelet Tool reduced by width*height bytes, no Issue

Browse Source
This commit is contained in:
Ingo
2015-02-01 21:48:40 +01:00
parent d8463e4b14
commit 2a18857b84
2 changed files with 21 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
rtengine/cplx_wavelet_dec.h
View File

@@ -43,7 +43,7 @@ namespace rtengine {
int lvltot, subsamp;
int numThreads;
size_t m_w, m_h;//dimensions
int m_w, m_h;//dimensions
int wavfilt_len, wavfilt_offset;
float *wavfilt_anal;
@@ -173,29 +173,15 @@ namespace rtengine {
return;
}
E *buffer[2];
buffer[0] = coeff0;
buffer[1] = new (std::nothrow) E[(m_w/2+1)*(m_h/2+1)];
if(buffer[1] == NULL) {
memoryAllocationFailed = true;
delete[] tmpHi;
delete[] tmpLo;
return;
}
int bufferindex = 0;
for (int lvl=lvltot; lvl>0; lvl--) {
wavelet_decomp[lvl]->reconstruct_level(tmpLo, tmpHi, buffer[bufferindex], buffer[bufferindex^1], wavfilt_synth, wavfilt_synth, wavfilt_len, wavfilt_offset);
bufferindex ^= 1;
wavelet_decomp[lvl]->reconstruct_level(tmpLo, tmpHi, coeff0, coeff0, wavfilt_synth, wavfilt_synth, wavfilt_len, wavfilt_offset);
}
wavelet_decomp[0]->reconstruct_level(tmpLo, tmpHi, buffer[bufferindex], dst, wavfilt_synth, wavfilt_synth, wavfilt_len, wavfilt_offset);
delete[] buffer[0];
delete[] buffer[1];
wavelet_decomp[0]->reconstruct_level(tmpLo, tmpHi, coeff0, dst, wavfilt_synth, wavfilt_synth, wavfilt_len, wavfilt_offset);
delete[] coeff0;
coeff0 = NULL;
delete[] tmpLo;
delete[] tmpHi;
}
};