Merge branch 'BR_v14_rc' into BR_quadtree

[modules/hydro.git] / src / HYDROData / HYDROData_ObstacleAltitude.cxx

diff --git a/src/HYDROData/HYDROData_ObstacleAltitude.cxx b/src/HYDROData/HYDROData_ObstacleAltitude.cxx
index 0c300146196f86a2839d6104966a3af6469e7d80..f8d56d9ffe2d41718d12ae1917b6a1c3f520dd34 100644 (file)
--- a/src/HYDROData/HYDROData_ObstacleAltitude.cxx
+++ b/src/HYDROData/HYDROData_ObstacleAltitude.cxx
@@ -1,3 +1,20 @@
+// Copyright (C) 2014-2015  EDF-R&D
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
 #include "HYDROData_ObstacleAltitude.h"
 
@@ -34,12 +51,12 @@ double HYDROData_ObstacleAltitude::GetAltitudeForPoint( const gp_XY& thePoint )
   if ( anObjectShape3D.IsNull() )
     return aResAltitude;
 
-  gp_Pnt aHighestPoint;
-
   HYDROData_Make3dMesh aMesher3D( anObjectShape3D, Precision::Intersection() );
-  aMesher3D.GetHighestOriginal( thePoint.X(), thePoint.Y(), aHighestPoint );
 
-  aResAltitude = aHighestPoint.Z();
+  gp_Pnt aHighestPoint;
+  if ( aMesher3D.GetHighestOriginal( thePoint.X(), thePoint.Y(), aHighestPoint ) )
+    aResAltitude = aHighestPoint.Z();
+
   return aResAltitude;
 }