Fix valgrind error: Mismatched free() / delete / delete []

[modules/geom.git] / src / GEOMAlgo / GEOMAlgo_SolidSolid.cxx

diff --git a/src/GEOMAlgo/GEOMAlgo_SolidSolid.cxx b/src/GEOMAlgo/GEOMAlgo_SolidSolid.cxx
index c0e99a2594573160982ffb056a17de9c7716f8ee..069ca0a2da171cd0b28aa1772a93731e36e65432 100644 (file)
--- a/src/GEOMAlgo/GEOMAlgo_SolidSolid.cxx
+++ b/src/GEOMAlgo/GEOMAlgo_SolidSolid.cxx
@@ -1,29 +1,31 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+// Copyright (C) 2007-2016  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
-// 
+//
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either 
-// version 2.1 of the License.
-// 
-// This library is distributed in the hope that it will be useful 
-// but WITHOUT ANY WARRANTY; without even the implied warranty of 
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU 
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 // Lesser General Public License for more details.
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
-// See http://www.salome-platform.org/
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
-// File:       GEOMAlgo_SolidSolid.cxx
-// Created:    Wed Jan 26 12:06:26 2005
-// Author:     Peter KURNEV
-//             <pkv@irinox>
 
-
-#include <GEOMAlgo_SolidSolid.ixx>
+// File:        GEOMAlgo_SolidSolid.cxx
+// Created:     Wed Jan 26 12:06:26 2005
+// Author:      Peter KURNEV
+//              <pkv@irinox>
+//
+#include <GEOMAlgo_SolidSolid.hxx>
 
 #include <Standard_Failure.hxx>
 
@@ -35,14 +37,11 @@
 #include <TopTools_ListIteratorOfListOfShape.hxx>
 #include <TopTools_IndexedMapOfShape.hxx>
 
-#include <BooleanOperations_ShapesDataStructure.hxx>
-#include <BOPTools_DSFiller.hxx>
-
 #include <GEOMAlgo_IndexedDataMapOfShapeState.hxx>
 
 //=======================================================================
 //function : GEOMAlgo_SolidSolid
-//purpose  : 
+//purpose  :
 //=======================================================================
 GEOMAlgo_SolidSolid::GEOMAlgo_SolidSolid()
 :
@@ -51,32 +50,32 @@ GEOMAlgo_SolidSolid::GEOMAlgo_SolidSolid()
 }
 //=======================================================================
 //function : ~
-//purpose  : 
+//purpose  :
 //=======================================================================
 GEOMAlgo_SolidSolid::~GEOMAlgo_SolidSolid()
 {
 }
 //=======================================================================
 // function: SetShape2
-// purpose: 
+// purpose:
 //=======================================================================
 void GEOMAlgo_SolidSolid::SetShape2(const TopoDS_Shape& aS2)
 {
   myS2=aS2;
-} 
+}
 //=======================================================================
 // function: Shape2
-// purpose: 
+// purpose:
 //=======================================================================
 const TopoDS_Shape& GEOMAlgo_SolidSolid::Shape2()const
 {
   return myS2;
-} 
+}
 //=======================================================================
 // function: Perform
-// purpose: 
+// purpose:
 //=======================================================================
-void GEOMAlgo_SolidSolid::Perform() 
+void GEOMAlgo_SolidSolid::Perform()
 {
   myErrorStatus=0;
   try {
@@ -84,19 +83,11 @@ void GEOMAlgo_SolidSolid::Perform()
       myErrorStatus=10;
       return;
     }
-    if(!myDSFiller->IsDone()) {
+    if(myDSFiller->HasErrors()) {
       myErrorStatus=11;
       return;
     }
     //
-    Standard_Boolean bIsNewFiller;
-    //
-    bIsNewFiller=myDSFiller->IsNewFiller();
-    if (bIsNewFiller) {
-      Prepare();
-      myDSFiller->SetNewFiller(!bIsNewFiller);
-    }
-    //
     myRank=2;
     BuildResult();
   }
@@ -106,9 +97,9 @@ void GEOMAlgo_SolidSolid::Perform()
 }
 //=================================================================================
 // function: BuildResult
-// purpose: 
+// purpose:
 //=================================================================================
-void GEOMAlgo_SolidSolid::BuildResult() 
+void GEOMAlgo_SolidSolid::BuildResult()
 {
   myErrorStatus=0;
   //
@@ -120,7 +111,7 @@ void GEOMAlgo_SolidSolid::BuildResult()
   GEOMAlgo_IndexedDataMapOfShapeState aMFS;
   //
   // 1. classify the faces
-  GEOMAlgo_ShellSolid::BuildResult(); 
+  GEOMAlgo_ShellSolid::Perform();
   //
   // 2. fill Shape-State map
   aIt.Initialize(myLSIN);
@@ -138,6 +129,7 @@ void GEOMAlgo_SolidSolid::BuildResult()
     const TopoDS_Shape& aF=aIt.Value();
     aMFS.Add(aF, TopAbs_ON);
   }
+  //
   myLSIN.Clear();
   myLSON.Clear();
   myLSOUT.Clear();
@@ -161,40 +153,40 @@ void GEOMAlgo_SolidSolid::BuildResult()
     for(j=1; j<aNbF; ++j) {
       const TopoDS_Shape& aF=aMF(j);
       //
-      if (!aMFS.Contains(aF)) {// the face is intesected 
-       ++aNbFINTR;
-       break; 
+      if (!aMFS.Contains(aF)) {// the face is intesected
+        ++aNbFINTR;
+        break;
       }
       //
       aState=aMFS.FindFromKey(aF);
       switch (aState) {
         case TopAbs_IN:
-         ++aNbFIN;
-         break;
-       case TopAbs_OUT:
-         ++aNbFOUT;
-         break;
-       case TopAbs_ON:
-         ++aNbFON;
-         break;
-       default:
-         break;
+          ++aNbFIN;
+          break;
+        case TopAbs_OUT:
+          ++aNbFOUT;
+          break;
+        case TopAbs_ON:
+          ++aNbFON;
+          break;
+        default:
+          break;
       }
       if (aNbFIN && aNbFOUT) {
-       ++aNbFINTR;
-       break;
+        ++aNbFINTR;
+        break;
       }
     }
     //
     if (!aNbFINTR) {
       if (aNbFON==aNbF) {
-       myLSON.Append(aSolid);
+        myLSON.Append(aSolid);
       }
       else if (aNbFIN) {
-       myLSIN.Append(aSolid);
+        myLSIN.Append(aSolid);
       }
       else if (aNbFOUT) {
-       myLSOUT.Append(aSolid);
+        myLSOUT.Append(aSolid);
       }
     }
   }