merge with dev

This commit is contained in:
Desmis
2019-06-04 18:29:58 +02:00
20 changed files with 92 additions and 72 deletions

View File

@@ -865,8 +865,8 @@ rtengine::RawImage* ToolPanelCoordinator::getFF()
const rtengine::FramesMetaData *imd = ipc->getInitialImage()->getMetaData();
if (imd) {
// int iso = imd->getISOSpeed(); temporarilly removed because unused
// double shutter = imd->getShutterSpeed(); temporarilly removed because unused
// int iso = imd->getISOSpeed(); temporarily removed because unused
// double shutter = imd->getShutterSpeed(); temporarily removed because unused
double aperture = imd->getFNumber();
double focallength = imd->getFocalLen();
std::string maker(imd->getMake());