ENH: use new demhandler API

include/otbSARDEMProjectionImageFilter.txx

@@ -52,9 +52,7 @@ namespace otb
     : m_SarSensorModelAdapter(ITK_NULLPTR), m_NoData(-32768), m_withXYZ(false), m_withH(false), 
       m_withSatPos(false), m_NbComponents(4), m_indH(4), m_indSatPos(4), m_geoidEmg96(NULL)
   {
-    std::cout << "ConfigurationManager::GetGeoidFile() = " << ConfigurationManager::GetGeoidFile() << std::endl;
-   
-    DEMHandlerPointerType DEMHandler = DEMHandler::Instance();
+    auto& DEMHandler = DEMHandler::GetInstance();
     
     m_geoidEmg96 = 0;
     const std::string isEmg96 =  "egm96";
@@ -62,7 +60,7 @@ namespace otb
     if (!(ConfigurationManager::GetGeoidFile().empty()))
       {
 	// DEMHandler instance to specify the geoid file
-	DEMHandler->OpenGeoidFile(ConfigurationManager::GetGeoidFile()); 
+	DEMHandler.OpenGeoidFile(ConfigurationManager::GetGeoidFile()); 
 
 	// If Geoid by default (emg96) instanciate directly a ossimGeoidEgm96 (increase performance)
 	std::size_t found = ConfigurationManager::GetGeoidFile().find(isEmg96);
@@ -293,7 +291,7 @@ SARDEMProjectionImageFilter< TImageIn, TImageOut >
 		}
 	      else
 		{
-		  h = DEMHandler::Instance()->GetHeightAboveEllipsoid(demGeoPoint[0],demGeoPoint[1]); 
+		  h = DEMHandler::GetInstance().GetHeightAboveEllipsoid(demGeoPoint[0],demGeoPoint[1]); 
 		}
 
 	      // Correct the height with earth geoid

include/otbSARFFTCorrelationGridImageFilter.txx

@@ -143,9 +143,9 @@ namespace otb
   SARFFTCorrelationGridImageFilter< TImageIn, TImageOut >
   ::activateDEM(const std::string DEMDirectory)
   {
-    DEMHandlerPointerType DEMHandler = DEMHandler::Instance();
-    DEMHandler->ClearDEMs();
-    DEMHandler->OpenDEMDirectory(DEMDirectory);    
+    auto & DEMHandler = DEMHandler::GetInstance();
+    DEMHandler.ClearDEMs();
+    DEMHandler.OpenDEMDirectory(DEMDirectory);
   }
 
   /**

include/otbSARGroupedByOrthoImageFilter.txx

@@ -58,10 +58,8 @@ namespace otb
   {
     // Inputs required 
     this->SetNumberOfRequiredInputs(2);
-
-    std::cout << "ConfigurationManager::GetGeoidFile() = " << ConfigurationManager::GetGeoidFile() << std::endl;
    
-    DEMHandlerPointerType DEMHandler = DEMHandler::Instance();
+    auto & DEMHandler = DEMHandler::GetInstance();
     
     m_geoidEmg96 = 0;
     const std::string isEmg96 =  "egm96";
@@ -69,7 +67,7 @@ namespace otb
     if (!(ConfigurationManager::GetGeoidFile().empty()))
       {
 	// DEMHandler instance to specify the geoid file
-	DEMHandler->OpenGeoidFile(ConfigurationManager::GetGeoidFile()); 
+	DEMHandler.OpenGeoidFile(ConfigurationManager::GetGeoidFile()); 
 
 	// If Geoid by default (emg96) instanciate directly a ossimGeoidEgm96 (increase performance)
 	std::size_t found = ConfigurationManager::GetGeoidFile().find(isEmg96);