Merge branch 'develop' into bugfix-1441

Modules/Radiometry/Simulation/include/otbSoilDataBase.h

@@ -23,6 +23,7 @@
 #define otbSoilDataBase_h
 
 #include "OTBSimulationExport.h"
+#include "itkMacro.h"
 #include <vector>
 #include <unordered_map>
 #include <string>
@@ -30,7 +31,7 @@
 namespace otb
 {
 
-class OTBSimulation_EXPORT SoilDataBase
+class ITK_ABI_EXPORT SoilDataBase
 {
 public:
   //wavelength in nm

Modules/Radiometry/Simulation/src/otbSoilDataBase.cxx

@@ -104,7 +104,7 @@ size_t SoilDataBase::CountColumns(std::string fileName) const
 }
 void SoilDataBase::ParseSoilFile()
 {
-  unsigned int number_of_soils = CountColumns(m_SoilFileName) - 1;
+  auto number_of_soils = CountColumns(m_SoilFileName) - 1;
   m_SoilDataVector.resize(number_of_soils);
   std::ifstream sdb(m_SoilFileName);
   if(! sdb.is_open())