From: jgv <jgv@opencascade.com>
Date: Wed, 20 Jan 2016 10:14:02 +0000 (+0300)
Subject: Correction of tolerances according to OCC26619
X-Git-Url: http://git.dev.opencascade.org/gitweb/?a=commitdiff_plain;h=ac7315780c004f376e3e730b8bb2dde324d78ad9;p=occt-copy.git

Correction of tolerances according to OCC26619
---

diff --git a/src/IntTools/IntTools_FaceFace.cxx b/src/IntTools/IntTools_FaceFace.cxx
index ae6c854cd0..04e988a123 100644
--- a/src/IntTools/IntTools_FaceFace.cxx
+++ b/src/IntTools/IntTools_FaceFace.cxx
@@ -353,8 +353,8 @@ static Standard_Boolean isTreatAnalityc(const TopoDS_Face& theF1,
   const Standard_Real Tolang = 1.e-8;
   const Standard_Real aTolF1=BRep_Tool::Tolerance(theF1);
   const Standard_Real aTolF2=BRep_Tool::Tolerance(theF2);
-  //const Standard_Real aTolSum = aTolF1 + aTolF2;
-  const Standard_Real aTolSum = Min(aTolF1, aTolF2);
+  const Standard_Real aTolSum = aTolF1 + aTolF2 + Precision::Confusion();
+  //const Standard_Real aTolSum = Min(aTolF1, aTolF2);
   Standard_Real aHigh = 0.0;
 
   const BRepAdaptor_Surface aBAS1(theF1), aBAS2(theF2);
@@ -483,8 +483,8 @@ void IntTools_FaceFace::Perform(const TopoDS_Face& aF1,
   const Standard_Real aTolF1=BRep_Tool::Tolerance(myFace1);
   const Standard_Real aTolF2=BRep_Tool::Tolerance(myFace2);
 
-  //Standard_Real TolArc = aTolF1 + aTolF2;
-  Standard_Real TolArc = Min(aTolF1, aTolF2);
+  Standard_Real TolArc = aTolF1 + aTolF2 + Precision::Confusion();
+  //Standard_Real TolArc = Min(aTolF1, aTolF2);
   Standard_Real TolTang = TolArc;
 
   const Standard_Boolean isFace1Quad = (aType1 == GeomAbs_Cylinder ||
@@ -546,7 +546,7 @@ void IntTools_FaceFace::Perform(const TopoDS_Face& aF1,
     return;
   }//if(aType1==GeomAbs_Plane && aType2==GeomAbs_Plane){
 
-  if ((aType1==GeomAbs_Plane) && isFace2Quad)
+  if ((aType1==GeomAbs_Plane)/* && isFace2Quad*/)
   {
     Standard_Real umin, umax, vmin, vmax;
     // F1
@@ -563,7 +563,7 @@ void IntTools_FaceFace::Perform(const TopoDS_Face& aF1,
       hasCone = Standard_True; 
     }
   }
-  else if ((aType2==GeomAbs_Plane) && isFace1Quad)
+  else if ((aType2==GeomAbs_Plane)/* && isFace1Quad*/)
   {
     Standard_Real umin, umax, vmin, vmax;
     //F1