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

Wavelet Levels - My kingdom for more wavelets - issue2594

Browse Source
This commit is contained in:
jdc
2015-01-29 07:07:00 +01:00
parent bc856c2377
commit 13e26d3979
39 changed files with 4008 additions and 136 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
rtengine/simpleprocess.cc
View File

@@ -22,7 +22,7 @@
#include "improcfun.h"
#include "curves.h"
#include "iccstore.h"
#include "clutstore.h"
#include "clutstore.h"
#include "processingjob.h"
#include <glibmm.h>
#include "../rtgui/options.h"
@@ -676,7 +676,7 @@ IImage16* processImage (ProcessingJob* pjob, int& errorCode, ProgressListener* p
// if clut was used and size of clut cache == 1 we free the memory used by the clutstore (default clut cache size = 1 for 32 bit OS)
if ( params.filmSimulation.enabled && !params.filmSimulation.clutFilename.empty() && options.clutCacheSize == 1)
clutStore.clearCache();
clutStore.clearCache();
// freeing up some memory
customToneCurve1.Reset();
@@ -775,9 +775,19 @@ IImage16* processImage (ProcessingJob* pjob, int& errorCode, ProgressListener* p
delete [] buffer[i];
delete [] buffer;
}
// directional pyramid equalizer
if((params.colorappearance.enabled && !settings->autocielab) || !params.colorappearance.enabled) ipf.dirpyrequalizer (labView, 1);//TODO: this is the luminance tonecurve, not the RGB one
WaveletParams WaveParams = params.wavelet;
WavCurve wavCLVCurve;
WavOpacityCurveRG waOpacityCurveRG;
WavOpacityCurveBY waOpacityCurveBY;
params.wavelet.getCurves(wavCLVCurve, waOpacityCurveRG, waOpacityCurveBY);
// directional pyramid wavelet
if((params.colorappearance.enabled && !settings->autocielab) || !params.colorappearance.enabled) ipf.dirpyrequalizer (labView, 1);//TODO: this is the luminance tonecurve, not the RGB one
int kall=2;
if((params.wavelet.enabled)) ipf.ip_wavelet(labView, labView, kall, WaveParams, wavCLVCurve, waOpacityCurveRG, waOpacityCurveBY, 1);
wavCLVCurve.Reset();
//Colorappearance and tone-mapping associated
int f_w=1,f_h=1;