From e83c01bfc022b1950734349952eb46ec2ac29993 Mon Sep 17 00:00:00 2001
From: pkv <pkv@opencascade.com>
Date: Fri, 21 Nov 2014 15:39:24 +0300
Subject: [PATCH] 0025505: General Fuse produces self-intersection shape

Changes:
class BOPAlgo_BuilderSolid
method:
void BOPAlgo_BuilderSolid::PerformAreas()

The misprint has been corrected

Test case for issue CR25505
---
 src/BOPAlgo/BOPAlgo_BuilderSolid.cxx |  4 +--
 tests/bugs/modalg_5/bug25505         | 39 ++++++++++++++++++++++++++++
 2 files changed, 41 insertions(+), 2 deletions(-)
 create mode 100755 tests/bugs/modalg_5/bug25505

diff --git a/src/BOPAlgo/BOPAlgo_BuilderSolid.cxx b/src/BOPAlgo/BOPAlgo_BuilderSolid.cxx
index 42b079a784..9d5167d7d2 100644
--- a/src/BOPAlgo/BOPAlgo_BuilderSolid.cxx
+++ b/src/BOPAlgo/BOPAlgo_BuilderSolid.cxx
@@ -684,8 +684,8 @@ void BOPAlgo_BuilderSolid::PerformAreas()
       }
       //
       if (aInOutMap.IsBound (aHole)){
-        const TopoDS_Shape& aHole2=aInOutMap(aHole);
-        if (IsInside(aHole, aHole2, myContext)) {
+        const TopoDS_Shape& aSolidWas=aInOutMap(aHole);
+        if (IsInside(aSolid, aSolidWas, myContext)) {
           aInOutMap.UnBind(aHole);
           aInOutMap.Bind (aHole, aSolid);
         }
diff --git a/tests/bugs/modalg_5/bug25505 b/tests/bugs/modalg_5/bug25505
new file mode 100755
index 0000000000..4ea26232e7
--- /dev/null
+++ b/tests/bugs/modalg_5/bug25505
@@ -0,0 +1,39 @@
+puts "============"
+puts "OCC25505"
+puts "============"
+puts ""
+###############################
+## General Fuse produces self-intersection shape
+###############################
+
+restore [locate_data_file bug25505_q.brep] q
+
+explode q
+
+bclearobjects
+bcleartools
+baddobjects q_1 q_2 q_3 q_4
+bfillds
+bbuild result
+
+set info [bopcheck result]
+
+if {[string compare ${info} " This shape seems to be OK.\n"] == 0} {
+    puts "OK: General Fuse produces good shape"
+} else {
+    puts "Error : General Fuse produces self-intersection shape"
+}
+
+set square 68796.4
+
+set nb_v_good 14
+set nb_e_good 21
+set nb_w_good 9
+set nb_f_good 9
+set nb_sh_good 7
+set nb_sol_good 4
+set nb_compsol_good 0
+set nb_compound_good  1
+set nb_shape_good 65
+
+set 3dviewer 1