ENH: remove the SetDataSetNumber method to avoid use GDALImageIO into otbImageFileReader.txx

Modules/Adapters/OSSIMAdapters/include/otbMetaDataKey.h

@@ -61,6 +61,7 @@ namespace MetaDataKey
   extern char const* VectorDataKeywordlistDelimiterKey;
 
   extern char const* ResolutionFactor;
+  extern char const* SubDatasetIndex;
   extern char const* CacheSizeInBytes;
 
   extern char const* TileHintX;

Modules/Adapters/OSSIMAdapters/src/otbMetaDataKey.cxx

@@ -54,6 +54,7 @@ char const* VectorDataKeywordlistKey = "VectorDataKeywordlist";
 char const* VectorDataKeywordlistDelimiterKey = "VectorDataKeywordlistDelimiter";
 
 char const* ResolutionFactor = "ResolutionFactor";
+char const* SubDatasetIndex = "SubDatasetIndex";
 char const* CacheSizeInBytes = "CacheSizeInBytes";
 
 char const* TileHintX = "TileHintX";
@@ -82,6 +83,7 @@ const MetaDataKey::KeyTypeDef Types[] =
   MetaDataKey::KeyTypeDef(MetaDataKey::VectorDataKeywordlistKey,          MetaDataKey::TVECTORDATAKEYWORDLIST),
   MetaDataKey::KeyTypeDef(MetaDataKey::VectorDataKeywordlistDelimiterKey, MetaDataKey::TSTRING),
   MetaDataKey::KeyTypeDef(MetaDataKey::ResolutionFactor,                  MetaDataKey::TENTIER),
+  MetaDataKey::KeyTypeDef(MetaDataKey::SubDatasetIndex,                   MetaDataKey::TENTIER),
   MetaDataKey::KeyTypeDef(MetaDataKey::CacheSizeInBytes,                  MetaDataKey::TENTIER),
   MetaDataKey::KeyTypeDef(MetaDataKey::TileHintX,                         MetaDataKey::TENTIER),
   MetaDataKey::KeyTypeDef(MetaDataKey::TileHintY,                         MetaDataKey::TENTIER)

Modules/IO/IOGDAL/include/otbGDALImageIO.h

@@ -95,10 +95,6 @@ public:
   itkSetMacro(IsVectorImage, bool);
   itkGetMacro(IsVectorImage, bool);
 
-  /** Set/Get the dataset index to extract (starting at 0)*/
-  itkSetMacro(DatasetNumber, unsigned int);
-  itkGetMacro(DatasetNumber, unsigned int);
-
   /** Set/Get the options */
   void SetOptions(const GDALCreationOptionsType& opts)
   {

Modules/IO/IOGDAL/src/otbGDALImageIO.cxx

@@ -545,6 +545,10 @@ void GDALImageIO::InternalReadImageInformation()
   itk::ExposeMetaData<unsigned int>(this->GetMetaDataDictionary(),
                                     MetaDataKey::ResolutionFactor,
                                     m_ResolutionFactor);
+                                    
+  itk::ExposeMetaData<unsigned int>(this->GetMetaDataDictionary(),
+                                    MetaDataKey::SubDatasetIndex,
+                                    m_DatasetNumber);
 
   // Detecting if we are in the case of an image with subdatasets
   // example: hdf Modis data

Modules/IO/ImageIO/include/otbImageFileReader.txx

@@ -337,16 +337,17 @@ ImageFileReader<TOutputImage, ConvertPixelTraits>
     else
       imageIO->SetIsVectorImage(false);
 
+    }
+
     // Pass the dataset number (used for hdf files for example)
     if (m_FilenameHelper->SubDatasetIndexIsSet())
       {
-      imageIO->SetDatasetNumber(m_FilenameHelper->GetSubDatasetIndex());
+      itk::EncapsulateMetaData<unsigned int>(dict, MetaDataKey::SubDatasetIndex, m_FilenameHelper->GetSubDatasetIndex());
       }
     else
       {
-      imageIO->SetDatasetNumber(m_AdditionalNumber);
+      itk::EncapsulateMetaData<unsigned int>(dict, MetaDataKey::SubDatasetIndex, m_AdditionalNumber);
       }
-    }
 
 
   if (m_FilenameHelper->ResolutionFactorIsSet())