Merge branch 'master' into dehaze

This commit is contained in:
Morgan Hardwood
2015-09-08 09:40:23 +02:00
76 changed files with 2999 additions and 2247 deletions

View File

@@ -24,6 +24,7 @@
#include <cstdio>
#include <cmath>
#include "LUT.h"
#include "coord.h"
class ParamsEdited;
@@ -1251,7 +1252,7 @@ public:
ResizeParams resize; ///< Resize parameters
ColorManagementParams icm; ///< profiles/color spaces used during the image processing
RAWParams raw; ///< RAW parameters before demosaicing
WaveletParams wavelet; ///< wavelet wavelet parameters
WaveletParams wavelet; ///< Wavelet parameters
DirPyrEqualizerParams dirpyrequalizer; ///< directional pyramid wavelet parameters
HSVEqualizerParams hsvequalizer; ///< hsv wavelet parameters
FilmSimulationParams filmSimulation; ///< film simulation parameters