From 8c745be5e052cf9ce994dedc47f59b7c66542db5 Mon Sep 17 00:00:00 2001
From: ifv <ifv@opencascade.com>
Date: Tue, 16 May 2017 17:37:13 +0300
Subject: [PATCH] 0028692: Projection failed (projponf)

Tolerance criterion is improved:
P.SquareDistance(p1) < Tol -> P.SquareDistance(p1) < Tol*Tol
---
 src/Extrema/Extrema_ExtPElS.cxx |  9 +++++----
 tests/bugs/modalg_6/bug28692    | 16 ++++++++++++++++
 2 files changed, 21 insertions(+), 4 deletions(-)
 create mode 100644 tests/bugs/modalg_6/bug28692

diff --git a/src/Extrema/Extrema_ExtPElS.cxx b/src/Extrema/Extrema_ExtPElS.cxx
index 59d5bfe1c5..8257b554c0 100644
--- a/src/Extrema/Extrema_ExtPElS.cxx
+++ b/src/Extrema/Extrema_ExtPElS.cxx
@@ -313,9 +313,10 @@ void Extrema_ExtPElS::Perform(const gp_Pnt&       P,
 			      const gp_Torus&     S,
 			      const Standard_Real Tol)
 {
+  const Standard_Real tol2 = Tol*Tol;
   myDone = Standard_False;
   myNbExt = 0;
-
+  
 // Projection of P in plane XOY ...
   gp_Ax3 Pos = S.Position();
   gp_Pnt O = Pos.Location();
@@ -325,7 +326,7 @@ void Extrema_ExtPElS::Perform(const gp_Pnt&       P,
 // Calculation of extrema ...
   gp_Vec OPp (O,Pp);
   Standard_Real R2 = OPp.SquareMagnitude();
-  if (R2 < Tol * Tol) { return; }
+  if (R2 < tol2) { return; }
  
   gp_Vec myZ = Pos.XDirection()^Pos.YDirection();
   Standard_Real U1 = gp_Vec(Pos.XDirection()).AngleWithRef(OPp,myZ);
@@ -338,8 +339,8 @@ void Extrema_ExtPElS::Perform(const gp_Pnt&       P,
   gp_Pnt O1 = O.Translated(OO1);
   gp_Pnt O2 = O.Translated(OO2);
 
-  if(O1.SquareDistance(P) < Tol) { return; }
-  if(O2.SquareDistance(P) < Tol) { return; }
+  if(O1.SquareDistance(P) < tol2) { return; }
+  if(O2.SquareDistance(P) < tol2) { return; }
 
   Standard_Real V1 = OPp.AngleWithRef(gp_Vec(O1,P),OPp.Crossed(OZ));
   if (V1 > -ExtPElS_MyEps && V1 < ExtPElS_MyEps) { V1 = 0.; }
diff --git a/tests/bugs/modalg_6/bug28692 b/tests/bugs/modalg_6/bug28692
new file mode 100644
index 0000000000..17eccde093
--- /dev/null
+++ b/tests/bugs/modalg_6/bug28692
@@ -0,0 +1,16 @@
+puts "========"
+puts "OCC28692"
+puts "========"
+puts ""
+####################################################################################
+## Projection failed (projponf)
+####################################################################################
+
+restore [locate_data_file bug28692_shapes.brep] bi3
+point p -0.0153 0 0.017
+set dist -1
+regexp {proj dist = ([-0-9.+eE]+)} [projponf bi3 p] full dist
+if { $dist < 0 || $dist > 1.e-7 } { 
+  puts "Error : Projection failed " 
+} 
+