Merge branch 'dev' into tiff32float

This commit is contained in:
Hombre
2017-12-20 00:21:23 +01:00
113 changed files with 7809 additions and 9781 deletions

View File

@@ -150,6 +150,8 @@ private:
bool idle_saveImage (ProgressConnector<rtengine::IImagefloat*> *pc, Glib::ustring fname, SaveFormat sf, rtengine::procparams::ProcParams &pparams);
bool idle_sendToGimp ( ProgressConnector<rtengine::IImagefloat*> *pc, Glib::ustring fname);
bool idle_sentToGimp (ProgressConnector<int> *pc, rtengine::IImagefloat* img, Glib::ustring filename);
void histogramProfile_toggled ();
Glib::ustring lastSaveAsFileName;
bool realized;
@@ -196,6 +198,7 @@ private:
Gtk::HBox* beforeAfterBox;
Gtk::HBox* beforeHeaderBox;
Gtk::HBox* afterHeaderBox;
Gtk::ToggleButton* toggleHistogramProfile;
Gtk::Frame* ppframe;
ProfilePanel* profilep;