Merge branch 'dev' into release-5.3-rc1

This commit is contained in:
Morgan Hardwood
2017-09-30 15:45:50 +02:00
3 changed files with 55 additions and 15 deletions

View File

@@ -601,7 +601,7 @@ void LensProfilePanel::LFDbHelper::fillLensfunCameras()
camnames[c.getMake()].insert(c.getModel());
if (options.rtSettings.verbose) {
std::cout << " found: " << c.getDisplayString() << std::endl;
std::cout << " found: " << c.getDisplayString().c_str() << std::endl;
}
}
for (auto &p : camnames) {
@@ -630,7 +630,7 @@ void LensProfilePanel::LFDbHelper::fillLensfunLenses()
lenses[make].insert(name);
if (options.rtSettings.verbose) {
std::cout << " found: " << l.getDisplayString() << std::endl;
std::cout << " found: " << l.getDisplayString().c_str() << std::endl;
}
}
for (auto &p : lenses) {