merge with Dev

This commit is contained in:
Desmis
2017-08-23 09:30:15 +02:00
20 changed files with 1816 additions and 1532 deletions

View File

@@ -222,7 +222,7 @@ public:
// toolpanellistener interface
void panelChanged (rtengine::ProcEvent event, const Glib::ustring& descr);
void imageTypeChanged(bool isRaw, bool isBayer, bool isXtrans);
void imageTypeChanged (bool isRaw, bool isBayer, bool isXtrans);
// profilechangelistener interface
void profileChange (const rtengine::procparams::PartialProfile* nparams, rtengine::ProcEvent event, const Glib::ustring& descr, const ParamsEdited* paramsEdited = nullptr);
void setDefaults (rtengine::procparams::ProcParams* defparams);
@@ -244,6 +244,8 @@ public:
// read/write the "expanded" state of the expanders & read/write the crop panel settings (ratio, guide type, etc.)
void readOptions ();
void writeOptions ();
void writeToolExpandedStatus (std::vector<int> &tpOpen);
// wbprovider interface
void getAutoWB (double& temp, double& green, double equal, double tempBias)