From 35f8794fb291a12692a955f15d718fc8c780b69b Mon Sep 17 00:00:00 2001
From: jgv <jgv@opencascade.com>
Date: Fri, 26 Dec 2014 14:04:06 +0300
Subject: [PATCH] 0025657: Bad result of Fillet operation

---
 src/ChFi3d/ChFi3d_Builder_C1.cxx |  4 +---
 tests/bugs/modalg_5/bug25657     | 25 +++++++++++++++++++++++++
 2 files changed, 26 insertions(+), 3 deletions(-)
 create mode 100644 tests/bugs/modalg_5/bug25657

diff --git a/src/ChFi3d/ChFi3d_Builder_C1.cxx b/src/ChFi3d/ChFi3d_Builder_C1.cxx
index 5125920ba9..a23214b60c 100644
--- a/src/ChFi3d/ChFi3d_Builder_C1.cxx
+++ b/src/ChFi3d/ChFi3d_Builder_C1.cxx
@@ -371,8 +371,7 @@ static Standard_Boolean Update(Handle(Adaptor3d_HSurface)& face,
     pared = ponc1.Parameter();
     parltg = ponc2.Parameter();
     if ((parltg > f) && (parltg < l)) {
-#ifdef OCC23139
-      ////modified by jgv, 10.05.2012 for the bug 23139////
+      ////modified by jgv, 10.05.2012 for the bug 23139, 25657////
       Handle(Geom2d_Curve) PConF = fi.PCurveOnFace();
       if (!PConF.IsNull())
       {
@@ -393,7 +392,6 @@ static Standard_Boolean Update(Handle(Adaptor3d_HSurface)& face,
         }
       }
       /////////////////////////////////////////////////////
-#endif
       fi.SetParameter(parltg,isfirst);
       cp.SetArc(cp.Tolerance(),cp.Arc(),pared,cp.TransitionOnArc());
       return Standard_True;
diff --git a/tests/bugs/modalg_5/bug25657 b/tests/bugs/modalg_5/bug25657
new file mode 100644
index 0000000000..61bb47f45b
--- /dev/null
+++ b/tests/bugs/modalg_5/bug25657
@@ -0,0 +1,25 @@
+puts "========"
+puts "OCC25657"
+puts "========"
+puts ""
+###########################################################################################
+#  Bad result of Fillet operation
+###########################################################################################
+
+restore [locate_data_file bug25657_r4.brep] r4
+explode r4 e
+shape c c
+add r4_15 c
+fillet res r4 20 c
+
+explode res f
+
+pcurve res_2
+# exception
+
+pcurve res_5
+# exception
+
+smallview
+fit
+set only_screen_axo 1