From 355a0c70d5a32dc23b4b504d5021f7522a5183d9 Mon Sep 17 00:00:00 2001
From: Guillaume Pasero <guillaume.pasero@c-s.fr>
Date: Tue, 4 Feb 2020 14:18:50 +0100
Subject: [PATCH] ENH: leave the current metadata enabled during refactoring
---
.../IO/ImageIO/include/otbImageFileReader.hxx | 32 ++++++++++---------
1 file changed, 17 insertions(+), 15 deletions(-)
diff --git a/Modules/IO/ImageIO/include/otbImageFileReader.hxx b/Modules/IO/ImageIO/include/otbImageFileReader.hxx
index 8c140486ff..3131167366 100644
--- a/Modules/IO/ImageIO/include/otbImageFileReader.hxx
+++ b/Modules/IO/ImageIO/include/otbImageFileReader.hxx
@@ -519,7 +519,7 @@ void ImageFileReader<TOutputImage, ConvertPixelTraits>::GenerateOutputInformatio
if (m_FilenameHelper->GetSkipGeom())
{
// Make sure the SensorGeometry is empty
- imd.SensorGeometry = boost::any();
+ imd.SensorGeometry.clear();
}
}
@@ -531,20 +531,22 @@ void ImageFileReader<TOutputImage, ConvertPixelTraits>::GenerateOutputInformatio
}
// Copy MetaDataDictionary from instantiated reader to output image.
- //~ if (!m_FilenameHelper->GetSkipGeom())
- //~ {
- //~ output->SetMetaDataDictionary(this->m_ImageIO->GetMetaDataDictionary());
- //~ this->SetMetaDataDictionary(this->m_ImageIO->GetMetaDataDictionary());
- //~ }
- //~ else
- //~ {
- //~ itk::MetaDataDictionary dictLight;
- //~ std::string projRef;
- //~ itk::ExposeMetaData(dict, MetaDataKey::ProjectionRefKey, projRef);
- //~ itk::EncapsulateMetaData<std::string>(dictLight, MetaDataKey::ProjectionRefKey, projRef);
- //~ output->SetMetaDataDictionary(dictLight);
- //~ this->SetMetaDataDictionary(dictLight);
- //~ }
+ // TODO: disable when Ossim removed
+ if (!m_FilenameHelper->GetSkipGeom())
+ {
+ output->SetMetaDataDictionary(this->m_ImageIO->GetMetaDataDictionary());
+ this->SetMetaDataDictionary(this->m_ImageIO->GetMetaDataDictionary());
+ }
+ else
+ {
+ itk::MetaDataDictionary dictLight;
+ std::string projRef;
+ itk::ExposeMetaData(dict, MetaDataKey::ProjectionRefKey, projRef);
+ itk::EncapsulateMetaData<std::string>(dictLight, MetaDataKey::ProjectionRefKey, projRef);
+ output->SetMetaDataDictionary(dictLight);
+ this->SetMetaDataDictionary(dictLight);
+ }
+
if (img_common != nullptr)
{
img_common->SetImageMetadata(imd);
--
GitLab