liz/rawTherapee
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'dev' into spot-removal-tool

Browse Source
This commit is contained in:
Hombre
2017-12-10 21:47:35 +01:00
parent 12ac1e2897 4cc7861125
commit e6659be98e
57 changed files with 6643 additions and 8955 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
rtgui/paramsedited.h
View File

@@ -574,7 +574,6 @@ public:
bool gamma;
bool gampos;
bool slpos;
bool gamfree;
bool freegamma;
};
class WaveletParamsEdited
@@ -771,14 +770,14 @@ public:
BayerSensor bayersensor;
XTransSensor xtranssensor;
bool caCorrection;
bool caRed;
bool caBlue;
bool ca_autocorrect;
bool cared;
bool cablue;
bool hotPixelFilter;
bool deadPixelFilter;
bool hotDeadPixelThresh;
bool hotdeadpix_thresh;
bool darkFrame;
bool dfAuto;
bool df_autoselect;
bool ff_file;
bool ff_AutoSelect;
bool ff_BlurRadius;
@@ -847,8 +846,5 @@ public:
void set (bool v);
void initFrom (const std::vector<rtengine::procparams::ProcParams>& src);
void combine (rtengine::procparams::ProcParams& toEdit, const rtengine::procparams::ProcParams& mods, bool forceSet);
bool operator== (const ParamsEdited& other);
bool operator!= (const ParamsEdited& other);
};
#endif