Merge branch 'master' into spot-removal-tool

This commit is contained in:
Hombre
2016-12-28 01:57:46 +01:00
383 changed files with 30405 additions and 10838 deletions

View File

@@ -519,7 +519,7 @@ void ToolPanelCoordinator::closeImage ()
if (ipc) {
ipc->stopProcessing ();
ipc = NULL;
ipc = nullptr;
}
}
@@ -649,7 +649,7 @@ void ToolPanelCoordinator::autoCropRequested ()
rtengine::RawImage* ToolPanelCoordinator::getDF()
{
if (!ipc) {
return NULL;
return nullptr;
}
const rtengine::ImageMetaData *imd = ipc->getInitialImage()->getMetaData();
@@ -664,13 +664,13 @@ rtengine::RawImage* ToolPanelCoordinator::getDF()
return rtengine::dfm.searchDarkFrame( maker, model, iso, shutter, timestamp);
}
return NULL;
return nullptr;
}
rtengine::RawImage* ToolPanelCoordinator::getFF()
{
if (!ipc) {
return NULL;
return nullptr;
}
const rtengine::ImageMetaData *imd = ipc->getInitialImage()->getMetaData();
@@ -688,7 +688,7 @@ rtengine::RawImage* ToolPanelCoordinator::getFF()
return rtengine::ffm.searchFlatField( maker, model, lens, focallength, aperture, timestamp);
}
return NULL;
return nullptr;
}
Glib::ustring ToolPanelCoordinator::GetCurrentImageFilePath()
@@ -767,7 +767,7 @@ void ToolPanelCoordinator::foldAllButOne (Gtk::Box* parent, FoldableToolPanel* o
{
for (auto toolPanel : toolPanels) {
if (toolPanel->getParent() != NULL) {
if (toolPanel->getParent() != nullptr) {
ToolPanel* currentTP = toolPanel;
if (currentTP->getParent() == parent) {