From 6f46ae0f0f477fdb70aa972c911fa99ec906606d Mon Sep 17 00:00:00 2001
From: Stephane ALBERT <stephane.albert@c-s.fr>
Date: Wed, 16 Sep 2015 18:04:54 +0200
Subject: [PATCH] ENH: Added bool return value when
otb::DEMHandler::OpenGeoidFile() has failed and thrown ITK exception when
file could not be properly loaded.
---
.../Adapters/OSSIMAdapters/include/otbDEMHandler.h | 4 ++--
.../Adapters/OSSIMAdapters/src/otbDEMHandler.cxx | 13 ++++++++++---
2 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/Modules/Adapters/OSSIMAdapters/include/otbDEMHandler.h b/Modules/Adapters/OSSIMAdapters/include/otbDEMHandler.h
index 75ee3e8820..fbc36ea417 100644
--- a/Modules/Adapters/OSSIMAdapters/include/otbDEMHandler.h
+++ b/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;
diff --git a/Modules/Adapters/OSSIMAdapters/src/otbDEMHandler.cxx b/Modules/Adapters/OSSIMAdapters/src/otbDEMHandler.cxx
index f5c824bd2a..8c2c28fb47 100644
--- a/Modules/Adapters/OSSIMAdapters/src/otbDEMHandler.cxx
+++ b/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
--
GitLab