- Patch for recent Debian distrib:

[modules/geom.git] / src / GEOMImpl / GEOMImpl_SphereDriver.cxx

diff --git a/src/GEOMImpl/GEOMImpl_SphereDriver.cxx b/src/GEOMImpl/GEOMImpl_SphereDriver.cxx
index c8d175adc02b0eee9fcc9aa7c4685db6ec3d3c2a..335f8c7c5ef49bdcf601230239a06d6c0929da96 100644 (file)
--- a/src/GEOMImpl/GEOMImpl_SphereDriver.cxx
+++ b/src/GEOMImpl/GEOMImpl_SphereDriver.cxx
@@ -1,22 +1,23 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
-// 
-// 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.
-// 
-// 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.
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// 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
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  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.
 //
+//  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 <Standard_Stream.hxx>
 
@@ -66,16 +67,27 @@ Standard_Integer GEOMImpl_SphereDriver::Execute(TFunction_Logbook& log) const
 
   TopoDS_Shape aShape;
 
+  char aMsg[] = "Sphere creation aborted: radius value less than 1e-07 is not acceptable";
+
   if (aType == SPHERE_R) {
-    aShape = BRepPrimAPI_MakeSphere(aCI.GetR()).Shape();
+    double anR = aCI.GetR();
+    if (anR < Precision::Confusion())
+      Standard_ConstructionError::Raise(aMsg);
+
+    aShape = BRepPrimAPI_MakeSphere(anR).Shape();
   }
   else if (aType == SPHERE_PNT_R) {
+    double anR = aCI.GetR();
+    if (anR < Precision::Confusion())
+      Standard_ConstructionError::Raise(aMsg);
+
     Handle(GEOM_Function) aRefPoint  = aCI.GetPoint();
     TopoDS_Shape aShapePnt = aRefPoint->GetValue();
-    if (aShapePnt.ShapeType() == TopAbs_VERTEX) {
-      gp_Pnt aP = BRep_Tool::Pnt(TopoDS::Vertex(aShapePnt));
-      aShape = BRepPrimAPI_MakeSphere(aP, aCI.GetR()).Shape();
-    }
+    if (aShapePnt.ShapeType() != TopAbs_VERTEX)
+      Standard_ConstructionError::Raise("Invalid shape given for sphere center: it must be a point");
+    gp_Pnt aP = BRep_Tool::Pnt(TopoDS::Vertex(aShapePnt));
+
+    aShape = BRepPrimAPI_MakeSphere(aP, anR).Shape();
   }
   else {
   }