Skip to content
Snippets Groups Projects
Commit 324839d9 authored by Cédric Traizet's avatar Cédric Traizet
Browse files

ENH: code review fixes

parent 86a69ada
No related branches found
No related tags found
No related merge requests found
......@@ -80,11 +80,7 @@ public:
bool HasValue(const char * path, int band=-1)
{
const char * ret = GetMetadataValue(path, band);
if (ret == nullptr)
{
return false;
}
return true;
return ret;
}
// utility functions
......
......@@ -52,15 +52,15 @@ ImageMetadataInterfaceFactory::ImageMetadataInterfaceBasePointerType ImageMetada
RegisterBuiltInFactories();
std::list<ImageMetadataInterfaceBasePointerType> possibleIMI;
std::list<itk::LightObject::Pointer> allOpticalObjects = itk::ObjectFactoryBase::CreateAllInstance("OpticalImageMetadataInterface");
std::list<itk::LightObject::Pointer> allSarObjects = itk::ObjectFactoryBase::CreateAllInstance("SarImageMetadataInterface");
auto allOpticalObjects = itk::ObjectFactoryBase::CreateAllInstance("OpticalImageMetadataInterface");
auto allSarObjects = itk::ObjectFactoryBase::CreateAllInstance("SarImageMetadataInterface");
std::list<itk::LightObject::Pointer> allObjects;
std::copy(allOpticalObjects.begin(), allOpticalObjects.end(), std::back_inserter(allObjects));
std::copy(allSarObjects.begin(), allSarObjects.end(), std::back_inserter(allObjects));
for (std::list<itk::LightObject::Pointer>::iterator i = allObjects.begin(); i != allObjects.end(); ++i)
for (auto i = allObjects.begin(); i != allObjects.end(); ++i)
{
ImageMetadataInterfaceBase* io = dynamic_cast<ImageMetadataInterfaceBase*>(i->GetPointer());
if (io)
......@@ -73,7 +73,7 @@ ImageMetadataInterfaceFactory::ImageMetadataInterfaceBasePointerType ImageMetada
}
}
for (std::list<ImageMetadataInterfaceBasePointerType>::iterator k = possibleIMI.begin(); k != possibleIMI.end(); ++k)
for (auto k = possibleIMI.begin(); k != possibleIMI.end(); ++k)
{
(*k)->SetMetaDataDictionary(dict);
if ((*k)->CanRead())
......@@ -93,14 +93,14 @@ ImageMetadataInterfaceFactory
{
RegisterBuiltInFactories();
std::list<itk::LightObject::Pointer> allOpticalObjects = itk::ObjectFactoryBase::CreateAllInstance("OpticalImageMetadataInterface");
std::list<itk::LightObject::Pointer> allSarObjects = itk::ObjectFactoryBase::CreateAllInstance("SarImageMetadataInterface");
std::list<itk::LightObject::Pointer> allObjects;
auto allOpticalObjects = itk::ObjectFactoryBase::CreateAllInstance("OpticalImageMetadataInterface");
auto allSarObjects = itk::ObjectFactoryBase::CreateAllInstance("SarImageMetadataInterface");
std::list<itk::LightObject::Pointer> allObjects;
std::copy(allOpticalObjects.begin(), allOpticalObjects.end(), std::back_inserter(allObjects));
std::copy(allSarObjects.begin(), allSarObjects.end(), std::back_inserter(allObjects));
for (std::list<itk::LightObject::Pointer>::iterator i = allObjects.begin(); i != allObjects.end(); ++i)
for (auto i = allObjects.begin(); i != allObjects.end(); ++i)
{
ImageMetadataInterfaceBase* io = dynamic_cast<ImageMetadataInterfaceBase*>(i->GetPointer());
if (io)
......@@ -125,7 +125,7 @@ ImageMetadataInterfaceFactory
}
}
DefaultImageMetadataInterface::Pointer defaultIMI = DefaultImageMetadataInterface::New();
auto defaultIMI = DefaultImageMetadataInterface::New();
defaultIMI->SetImageMetadata(imd);
return dynamic_cast<ImageMetadataInterfaceBase*>(static_cast<DefaultImageMetadataInterface*>(defaultIMI));
}
......
......@@ -52,9 +52,7 @@ public:
protected:
GDALImageMetadataInterface();
~GDALImageMetadataInterface() override
{
}
~GDALImageMetadataInterface() override = default;
private:
GDALImageMetadataInterface(const Self&) = delete;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment