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

Merge branch 'master' into gtk3-merge-master-b8eb349

Browse Source
This commit is contained in:
Morgan Hardwood
2016-10-10 23:07:41 +02:00
parent d16d244fc5 b8eb3492c9
commit 0dbea030cb
166 changed files with 15898 additions and 2285 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
rtgui/editorpanel.cc
View File

@@ -169,7 +169,7 @@ private:
}
public:
MonitorProfileSelector (rtengine::StagedImageProcessor* const& ipc) :
explicit MonitorProfileSelector (rtengine::StagedImageProcessor* const& ipc) :
intentBox (Glib::ustring (), true),
processor (ipc)
{
@@ -324,6 +324,7 @@ EditorPanel::EditorPanel (FilePanel* filePanel)
iareapanel = new ImageAreaPanel ();
tpc->setEditProvider (iareapanel->imageArea);
tpc->getToolBar()->setLockablePickerToolListener(iareapanel->imageArea);
Gtk::HBox* toolBarPanel = Gtk::manage (new Gtk::HBox ());
toolBarPanel->set_name ("EditorTopPanel");
@@ -811,6 +812,7 @@ void EditorPanel::close ()
if (iareapanel) {
iareapanel->imageArea->setPreviewHandler (NULL);
iareapanel->imageArea->setImProcCoordinator (NULL);
iareapanel->imageArea->unsubscribe();
}
rtengine::StagedImageProcessor::destroy (ipc);