From da228351635591d61d5716eef34927f55da488db Mon Sep 17 00:00:00 2001
From: msv <msv@opencascade.com>
Date: Mon, 5 Mar 2018 20:09:08 +0300
Subject: [PATCH] Pick commit from master to eliminate false error reporting
 about unclosed wires.

---
 src/BRepCheck/BRepCheck_Wire.cxx | 25 ++++++++++++++++++-------
 1 file changed, 18 insertions(+), 7 deletions(-)

diff --git a/src/BRepCheck/BRepCheck_Wire.cxx b/src/BRepCheck/BRepCheck_Wire.cxx
index 2f1e7a6a3c..06706a749a 100644
--- a/src/BRepCheck/BRepCheck_Wire.cxx
+++ b/src/BRepCheck/BRepCheck_Wire.cxx
@@ -393,7 +393,7 @@ Standard_Boolean IsDistanceIn3DTolerance (const gp_Pnt& thePnt_f,
   }
 
 //=======================================================================
-//function : IsDistanceIn3DTolerance
+//function : IsDistanceIn2DTolerance
 //purpose  : 
 //=======================================================================
 static 
@@ -432,20 +432,32 @@ Standard_Boolean IsDistanceIn2DTolerance (const BRepAdaptor_Surface& aFaceSurfac
     cout << "VFirst = " << aFaceSurface.FirstVParameter();
     cout << "; VLast = " << aFaceSurface.LastVParameter()														<< endl;
     }
-
+#endif
   dumax = aFaceSurface.UResolution(aTol3d);
   dvmax = aFaceSurface.VResolution(aTol3d);
+  gp_Pnt aP;
+  gp_Vec aDU, aDV;
+  Standard_Real um = (thePnt.X() + thePntRef.X()) / 2.;
+  Standard_Real vm = (thePnt.Y() + thePntRef.Y()) / 2.;
+  aFaceSurface.D1(um, vm, aP, aDU, aDV);
+  Standard_Real aMDU = aDU.Magnitude();
+  if (aMDU > Precision::Confusion())
+  {
+    dumax = Max((aTol3d / aMDU), dumax);
+  }
+  Standard_Real aMDV = aDV.Magnitude();
+  if (aMDV > Precision::Confusion())
+  {
+    dvmax = Max((aTol3d / aMDV), dvmax);
+  }
 
+#ifdef OCCT_DEBUG
   if(PrintWarnings)
     {
     cout << "aTol3d = " << aTol3d <<"; URes = " << dumax << "; VRes = " << dvmax		<< endl;
     cout << "thePnt(" << thePnt.X() << "; " << thePnt.Y() << ")"										<< endl;
     cout << "thePntRef(" << thePntRef.X() << "; " << thePntRef.Y() << ")"						<< endl;
     }
-
-#else
-  dumax = aFaceSurface.UResolution(aTol3d);
-  dvmax = aFaceSurface.VResolution(aTol3d);
 #endif
 
   Standard_Real aTol2d = 2*Max(	dumax, dvmax);
@@ -458,7 +470,6 @@ Standard_Boolean IsDistanceIn2DTolerance (const BRepAdaptor_Surface& aFaceSurfac
     }
 #endif
 
-  //Standard_Real Dist = thePntRef.Distance(thePnt);
   Standard_Real Dist = Max(dumin, dvmin);
   
   if (Dist < aTol2d)
-- 
2.39.5