MRG

Code/IO/otbDEMHandler.cxx

@@ -42,14 +42,17 @@ void
 DEMHandler
 ::OpenDEMDirectory(const char* DEMDirectory)
 {
+  m_Mutex.Lock();
   ossimFilename ossimDEMDir;
   ossimDEMDir=ossimFilename(DEMDirectory);
 
   ossimDirectory od(DEMDirectory);
   if (!m_ElevManager->loadElevationPath(ossimDEMDir))
   {
+    m_Mutex.Unlock();
     itkExceptionMacro("Failed to open DEM Directory: "<<ossimDEMDir);
   }
+  m_Mutex.Unlock();
 }
 
 void
@@ -63,7 +66,9 @@ DEMHandler
     ossimGeoid* geoidPtr = new ossimGeoidEgm96(geoid);
     if (geoidPtr->getErrorStatus() == ossimErrorCodes::OSSIM_OK)
     {
+       m_Mutex.Lock();
        ossimGeoidManager::instance()->addGeoid(geoidPtr);
+       m_Mutex.Unlock();
     }
     else
     {
@@ -81,7 +86,9 @@ DEMHandler
   ossimGpt ossimWorldPoint;
   ossimWorldPoint.lon=geoPoint[0];
   ossimWorldPoint.lat=geoPoint[1];
+  m_Mutex.Lock();
   height=m_ElevManager->getHeightAboveMSL(ossimWorldPoint);
+  m_Mutex.Unlock();
   return height;
 }
 
@@ -93,7 +100,9 @@ DEMHandler
   ossimGpt ossimWorldPoint;
   ossimWorldPoint.lon=geoPoint[0];
   ossimWorldPoint.lat=geoPoint[1];
+  m_Mutex.Lock();
   height=m_ElevManager->getHeightAboveEllipsoid(ossimWorldPoint);
+  m_Mutex.Unlock();
   return height;
 }
 

Code/IO/otbDEMHandler.h

@@ -26,6 +26,7 @@
 
 #include "itkImageRegionIteratorWithIndex.h"
 #include "itkIndent.h"
+#include "itkSimpleFastMutexLock.h"
 
 class ossimElevManager;
 
@@ -79,6 +80,8 @@ protected:
 
   ossimElevManager* m_ElevManager;
 
+  itk::SimpleFastMutexLock m_Mutex;
+
 };
 
 } // namespace otb