ForkMaster/geom
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/geom.git synced 2025-01-30 20:30:32 +05:00
Code Issues Packages Projects Releases Wiki Activity

Bug 0020233: Infinite loop in boolean operation with a sphere with r=0

Browse Source
This commit is contained in:
jfa 2009-04-10 10:59:46 +00:00
parent 268965c6d9
commit 7141475d33
2 changed files with 23 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/GEOMImpl/GEOMImpl_CircleDriver.cxx
View File

@ -111,8 +111,13 @@ Standard_Integer GEOMImpl_CircleDriver::Execute(TFunction_Logbook& log) const
} }
// Axes // Axes
gp_Ax2 anAxes (aP, aV); 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 // Circle
gp_Circ aCirc (anAxes, aCI.GetRadius()); gp_Circ aCirc (anAxes, anR);
aShape = BRepBuilderAPI_MakeEdge(aCirc).Edge(); aShape = BRepBuilderAPI_MakeEdge(aCirc).Edge();
} }
else if (aType == CIRCLE_CENTER_TWO_PNT) { else if (aType == CIRCLE_CENTER_TWO_PNT) {

23
src/GEOMImpl/GEOMImpl_SphereDriver.cxx
View File

@ -18,7 +18,7 @@
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
// //
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
//
#include <Standard_Stream.hxx> #include <Standard_Stream.hxx>
#include <GEOMImpl_SphereDriver.hxx> #include <GEOMImpl_SphereDriver.hxx>
@ -67,16 +67,27 @@ Standard_Integer GEOMImpl_SphereDriver::Execute(TFunction_Logbook& log) const
TopoDS_Shape aShape; TopoDS_Shape aShape;
char aMsg[] = "Sphere creation aborted: radius value less than 1e-07 is not acceptable";
if (aType == SPHERE_R) { 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) { else if (aType == SPHERE_PNT_R) {
double anR = aCI.GetR();
if (anR < Precision::Confusion())
Standard_ConstructionError::Raise(aMsg);
Handle(GEOM_Function) aRefPoint = aCI.GetPoint(); Handle(GEOM_Function) aRefPoint = aCI.GetPoint();
TopoDS_Shape aShapePnt = aRefPoint->GetValue(); TopoDS_Shape aShapePnt = aRefPoint->GetValue();
if (aShapePnt.ShapeType() == TopAbs_VERTEX) { if (aShapePnt.ShapeType() != TopAbs_VERTEX)
gp_Pnt aP = BRep_Tool::Pnt(TopoDS::Vertex(aShapePnt)); Standard_ConstructionError::Raise("Invalid shape given for sphere center: it must be a point");
aShape = BRepPrimAPI_MakeSphere(aP, aCI.GetR()).Shape(); gp_Pnt aP = BRep_Tool::Pnt(TopoDS::Vertex(aShapePnt));
}
aShape = BRepPrimAPI_MakeSphere(aP, anR).Shape();
} }
else { else {
} }