merge with dev

This commit is contained in:
U-PC-BUREAU\jacques
2018-11-01 08:37:28 +01:00
75 changed files with 1248 additions and 378 deletions

View File

@@ -81,6 +81,7 @@
#include "fattaltonemap.h"
#include "localcontrast.h"
#include "softlight.h"
#include "dehaze.h"
#include "guiutils.h"
class ImageEditorCoordinator;
@@ -137,6 +138,7 @@ protected:
DirPyrEqualizer* dirpyrequalizer;
HSVEqualizer* hsvequalizer;
SoftLight *softlight;
Dehaze *dehaze;
FilmSimulation *filmSimulation;
SensorBayer * sensorbayer;
SensorXTrans * sensorxtrans;