Merged dev into locallab_dev

This commit is contained in:
heckflosse
2017-03-26 00:49:44 +01:00
62 changed files with 3133 additions and 2051 deletions

View File

@@ -93,7 +93,8 @@ class ToolPanelCoordinator : public ToolPanelListener,
public SpotWBListener,
public CropPanelListener,
public ICMPanelListener,
public ImageAreaToolListener
public ImageAreaToolListener,
public rtengine::ImageTypeListener
{
protected:
@@ -234,6 +235,7 @@ public:
// toolpanellistener interface
void panelChanged (rtengine::ProcEvent event, const Glib::ustring& descr);
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);