merge 'soft-light' into 'dev'

This commit is contained in:
Alberto Griggio
2018-06-29 23:34:31 +02:00
19 changed files with 330 additions and 2 deletions

View File

@@ -1215,6 +1215,17 @@ struct FilmSimulationParams {
};
struct SoftLightParams {
bool enabled;
int strength;
SoftLightParams();
bool operator==(const SoftLightParams &other) const;
bool operator!=(const SoftLightParams &other) const;
};
/**
* Parameters for RAW demosaicing, common to all sensor type
*/
@@ -1423,6 +1434,7 @@ public:
DirPyrEqualizerParams dirpyrequalizer; ///< directional pyramid wavelet parameters
HSVEqualizerParams hsvequalizer; ///< hsv wavelet parameters
FilmSimulationParams filmSimulation; ///< film simulation parameters
SoftLightParams softlight; ///< softlight parameters
int rank; ///< Custom image quality ranking
int colorlabel; ///< Custom color label
bool inTrash; ///< Marks deleted image