Merge branch 'dev' into spot-removal-tool (see #2239)

This commit is contained in:
Hombre
2017-11-25 23:30:52 +01:00
320 changed files with 17146 additions and 8522 deletions

View File

@@ -365,6 +365,14 @@ public:
};
class FattalToneMappingParamsEdited {
public:
bool enabled;
bool threshold;
bool amount;
};
class SHParamsEdited
{
@@ -428,6 +436,8 @@ class LensProfParamsEdited
{
public:
bool lcpFile, useDist, useVign, useCA;
bool useLensfun, lfAutoMatch, lfCameraMake, lfCameraModel, lfLens;
bool lcMode;
bool isUnchanged() const;
};
@@ -805,6 +815,7 @@ public:
DefringeParamsEdited defringe;
DirPyrDenoiseParamsEdited dirpyrDenoise;
EPDParamsEdited epd;
FattalToneMappingParamsEdited fattal;
ImpulseDenoiseParamsEdited impulseDenoise;
SHParamsEdited sh;
CropParamsEdited crop;