merge with dev

This commit is contained in:
Desmis
2017-12-13 08:42:13 +01:00
53 changed files with 645 additions and 375 deletions

View File

@@ -370,6 +370,7 @@ struct LCurveParams {
* Parameters of the RGB curves
*/
struct RGBCurvesParams {
bool enabled;
bool lumamode;
std::vector<double> rcurve;
std::vector<double> gcurve;
@@ -543,6 +544,7 @@ struct WBEntry {
};
struct WBParams {
bool enabled;
Glib::ustring method;
int temperature;
double green;
@@ -1026,6 +1028,7 @@ struct VignettingParams {
* Parameters of the color mixer
*/
struct ChannelMixerParams {
bool enabled;
int red[3];
int green[3];
int blue[3];
@@ -1268,6 +1271,7 @@ struct DirPyrEqualizerParams {
* HSV equalizer params
*/
struct HSVEqualizerParams {
bool enabled;
std::vector<double> hcurve;
std::vector<double> scurve;
std::vector<double> vcurve;