ENH: Added bool return value when otb::DEMHandler::OpenGeoidFile() has failed...

ENH: Added bool return value when otb::DEMHandler::OpenGeoidFile() has failed and thrown ITK exception when file could not be properly loaded.

Modules/Adapters/OSSIMAdapters/include/otbDEMHandler.h

@@ -108,8 +108,8 @@ public:
   virtual bool IsValidDEMDirectory(const char* DEMDirectory);
 
   /** Open geoid file. */
-  virtual void OpenGeoidFile(const char* geoidFile);
-  virtual void OpenGeoidFile(const std::string& geoidFile);
+  virtual bool OpenGeoidFile(const char* geoidFile);
+  virtual bool OpenGeoidFile(const std::string& geoidFile);
 
   /** Compute the height above MSL(Mean Sea Level) of a geographic point. */
   virtual double GetHeightAboveMSL(double lon, double lat) const;

Modules/Adapters/OSSIMAdapters/src/otbDEMHandler.cxx

@@ -126,7 +126,7 @@ DEMHandler
   return result;
 }
 
-void
+bool
 DEMHandler
 ::OpenGeoidFile(const char* geoidFile)
 {
@@ -150,20 +150,27 @@ DEMHandler
 
       ossimElevManager::instance()->setDefaultHeightAboveEllipsoid(ossim::nan());
 
+      return true;
       }
     else
       {
       otbMsgDevMacro(<< "Failure opening geoid");
       geoidPtr.release();
+
+      itkExceptionMacro( << "Failed to open geoid file: '" << geoidFile << "'" );
+
+      return false;
       }
     }
+
+  return false;
 }
 
-void
+bool
 DEMHandler
 ::OpenGeoidFile(const std::string& geoidFile)
 {
-  OpenGeoidFile(geoidFile.c_str());
+  return OpenGeoidFile(geoidFile.c_str());
 }
 
 double