Salome HOME
projects
/
modules
/
geom.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[bos #41409][FORUM] (2024) kindOfShape() bug for CONE2D
[modules/geom.git]
/
src
/
GEOMAlgo
/
GEOMAlgo_Gluer.cxx
diff --git
a/src/GEOMAlgo/GEOMAlgo_Gluer.cxx
b/src/GEOMAlgo/GEOMAlgo_Gluer.cxx
index d9f80790674a5b82a18836fa47b6a3b58b37ea08..bf7a38223260928577f5fe9bdcbbbf35cf0d4874 100644
(file)
--- a/
src/GEOMAlgo/GEOMAlgo_Gluer.cxx
+++ b/
src/GEOMAlgo/GEOMAlgo_Gluer.cxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-20
15 CEA/DEN, EDF R&D
, OPEN CASCADE
+// Copyright (C) 2007-20
24 CEA, EDF
, OPEN CASCADE
//
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
//
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@
-78,11
+78,7
@@
#include <BRepBndLib.hxx>
//
#include <IntTools_Tools.hxx>
#include <BRepBndLib.hxx>
//
#include <IntTools_Tools.hxx>
-#if OCC_VERSION_LARGE > 0x06070100
#include <IntTools_Context.hxx>
#include <IntTools_Context.hxx>
-#else
-#include <BOPInt_Context.hxx>
-#endif
#include <BOPTools_AlgoTools.hxx>
#include <BOPTools_AlgoTools3D.hxx>
#include <BOPTools_AlgoTools2D.hxx>
#include <BOPTools_AlgoTools.hxx>
#include <BOPTools_AlgoTools3D.hxx>
#include <BOPTools_AlgoTools2D.hxx>
@@
-514,7
+510,8
@@
void GEOMAlgo_Gluer::MakeSolids()
myResult=aCmp;
//
if (aMS.Extent()) {
myResult=aCmp;
//
if (aMS.Extent()) {
- BOPTools_AlgoTools::CorrectCurveOnSurface(myResult, 0.0001);
+ TopTools_IndexedMapOfShape aMapToAvoid;
+ BOPTools_AlgoTools::CorrectCurveOnSurface(myResult, aMapToAvoid, 0.0001);
}
}
//=======================================================================
}
}
//=======================================================================
@@
-907,9
+904,9
@@
void GEOMAlgo_Gluer::MakeEdge(const TopoDS_Edge& aE,
Standard_Real aTol;
BRep_Builder aBB;
TopoDS_Edge E;
Standard_Real aTol;
BRep_Builder aBB;
TopoDS_Edge E;
- TopAbs_Orientation anOrE;
+
//
TopAbs_Orientation anOrE;
//
//
- anOrE=aE.Orientation();
+
//
anOrE=aE.Orientation();
aTol=BRep_Tool::Tolerance(aE);
//
E=aEx;
aTol=BRep_Tool::Tolerance(aE);
//
E=aEx;