0020907: Werror in GEOM: integrate patch from Erwan ADAM

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

diff --git a/src/GEOMImpl/GEOMImpl_CircleDriver.cxx b/src/GEOMImpl/GEOMImpl_CircleDriver.cxx
index 2edcc5c1b4263ae9c3a79f1c71daf661aa58ae2e..d21cbef727942a7a6136cf4531e2f03c3e6e2143 100644 (file)
--- a/src/GEOMImpl/GEOMImpl_CircleDriver.cxx
+++ b/src/GEOMImpl/GEOMImpl_CircleDriver.cxx
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 //  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -19,6 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 #include <Standard_Stream.hxx>
 
 #include <GEOMImpl_CircleDriver.hxx>
@@ -111,8 +112,13 @@ Standard_Integer GEOMImpl_CircleDriver::Execute(TFunction_Logbook& log) const
     }
     // Axes
     gp_Ax2 anAxes (aP, aV);
+    // Radius
+    double anR = aCI.GetRadius();
+    char aMsg[] = "Circle creation aborted: radius value less than 1e-07 is not acceptable";
+    if (anR < Precision::Confusion())
+      Standard_ConstructionError::Raise(aMsg);
     // Circle
-    gp_Circ aCirc (anAxes, aCI.GetRadius());
+    gp_Circ aCirc (anAxes, anR);
     aShape = BRepBuilderAPI_MakeEdge(aCirc).Edge();
   }
   else if (aType == CIRCLE_CENTER_TWO_PNT) {
@@ -213,10 +219,10 @@ Standard_EXPORT Handle_Standard_Type& GEOMImpl_CircleDriver_Type_()
 
   static Handle_Standard_Transient _Ancestors[]= {aType1,aType2,aType3,NULL};
   static Handle_Standard_Type _aType = new Standard_Type("GEOMImpl_CircleDriver",
-                                                        sizeof(GEOMImpl_CircleDriver),
-                                                        1,
-                                                        (Standard_Address)_Ancestors,
-                                                        (Standard_Address)NULL);
+                                                         sizeof(GEOMImpl_CircleDriver),
+                                                         1,
+                                                         (Standard_Address)_Ancestors,
+                                                         (Standard_Address)NULL);
 
   return _aType;
 }