merge with dev

This commit is contained in:
Desmis
2018-12-11 07:40:54 +01:00
99 changed files with 2409 additions and 1833 deletions

View File

@@ -259,7 +259,8 @@ protected:
float colourToningSatLimitOpacity;
bool lastspotdup;
bool highQualityComputed;
cmsHTRANSFORM customTransformIn;
cmsHTRANSFORM customTransformOut;
public:
ImProcCoordinator ();
@@ -418,6 +419,16 @@ public:
return imgsrc;
}
cmsHTRANSFORM& getCustomTransformIn ()
{
return customTransformIn;
}
cmsHTRANSFORM& getCustomTransformOut ()
{
return customTransformOut;
}
struct DenoiseInfoStore {
DenoiseInfoStore() : chM(0), max_r{}, max_b{}, ch_M{}, valid(false) {}
float chM;