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

Reduce memory footprint of 5-level Contrast-by-Detail, Issue 2124 comment 28

Browse Source
This commit is contained in:
Ingo
2013-12-18 23:47:24 +01:00
parent e50269a0e7
commit c65ce41b6a
1 changed files with 5 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
rtengine/dirpyr_equalizer.cc
View File

@@ -63,7 +63,6 @@ namespace rtengine {
if (lastlevel==0) return; if (lastlevel==0) return;
int level; int level;
array2D<float> buffer (srcwidth, srcheight, ARRAY2D_CLEAR_DATA);
multi_array2D<float,maxlevel> dirpyrlo (srcwidth, srcheight); multi_array2D<float,maxlevel> dirpyrlo (srcwidth, srcheight);
@@ -85,17 +84,8 @@ namespace rtengine {
level ++; level ++;
} }
//%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% // with the current implementation of idirpyr_eq_channel we can safely use the buffer from last level as buffer, saves some memory
//initiate buffer for final image float ** buffer = dirpyrlo[lastlevel-1];
for(int i = 0; i < srcheight; i++)
for(int j = 0; j < srcwidth; j++) {
//copy pixels
buffer[i][j] = dirpyrlo[lastlevel-1][i][j];
}
//%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
for(int level = lastlevel - 1; level > 0; level--) for(int level = lastlevel - 1; level > 0; level--)
{ {
@@ -136,8 +126,7 @@ namespace rtengine {
if (lastlevel==0) return; if (lastlevel==0) return;
int level; int level;
array2D<float> buffer (srcwidth, srcheight, ARRAY2D_CLEAR_DATA);
multi_array2D<float,maxlevel> dirpyrlo (srcwidth, srcheight); multi_array2D<float,maxlevel> dirpyrlo (srcwidth, srcheight);
level = 0; level = 0;
@@ -158,17 +147,9 @@ namespace rtengine {
level ++; level ++;
} }
//%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
//initiate buffer for final image
for(int i = 0; i < srcheight; i++)
for(int j = 0; j < srcwidth; j++) {
//copy pixels
buffer[i][j] = dirpyrlo[lastlevel-1][i][j];
}
//%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
// with the current implementation of idirpyr_eq_channel we can safely use the buffer from last level as buffer, saves some memory
float ** buffer = dirpyrlo[lastlevel-1];
for(int level = lastlevel - 1; level > 0; level--) for(int level = lastlevel - 1; level > 0; level--)
{ {