patch for incorrect compilation

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

diff --git a/src/GEOMAlgo/GEOMAlgo_Gluer2.cxx b/src/GEOMAlgo/GEOMAlgo_Gluer2.cxx
index 21a810e7cd2122d60ccea6ca37306e525bc751b5..ed9294944c2c134e321ef032d52ca1608e3e883e 100644 (file)
--- a/src/GEOMAlgo/GEOMAlgo_Gluer2.cxx
+++ b/src/GEOMAlgo/GEOMAlgo_Gluer2.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2013  CEA/DEN, EDF R&D, OPEN CASCADE
+// 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
@@ -6,7 +6,7 @@
 // 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.
+// 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
@@ -44,8 +44,10 @@
 #include <TopTools_DataMapIteratorOfDataMapOfShapeListOfShape.hxx>
 #include <TopTools_IndexedMapOfShape.hxx>
 
+#include <BOPTools_AlgoTools.hxx>
+
 #include <GEOMAlgo_GlueDetector.hxx>
-#include <GEOMAlgo_Tools3D.hxx>
+#include <GEOMAlgo_AlgoTools.hxx>
 
 //=======================================================================
 //function : GEOMAlgo_Gluer2
@@ -82,11 +84,8 @@ void GEOMAlgo_Gluer2::Clear()
   myImagesToWork.Clear();
   myOriginsToWork.Clear();
   myKeepNonSolids=Standard_False;
-  //modified by NIZNHY-PKV Tue Mar 13 13:38:28 2012f
   myDetector.Clear();
-  //modified by NIZNHY-PKV Tue Mar 13 13:38:30 2012t
 }
-//modified by NIZNHY-PKV Tue Mar 13 12:26:50 2012f
 //=======================================================================
 //function : StickedShapes
 //purpose  :
@@ -96,12 +95,12 @@ const TopTools_IndexedDataMapOfShapeListOfShape&
 {
   return myDetector.StickedShapes();
 }
-//modified by NIZNHY-PKV Tue Mar 13 12:26:54 2012t
 //=======================================================================
 //function : SetShapesToGlue
 //purpose  :
 //=======================================================================
-void GEOMAlgo_Gluer2::SetShapesToGlue(const TopTools_DataMapOfShapeListOfShape& aM)
+void GEOMAlgo_Gluer2::SetShapesToGlue
+  (const TopTools_DataMapOfShapeListOfShape& aM)
 {
   myShapesToGlue=aM;
 }
@@ -239,6 +238,7 @@ void GEOMAlgo_Gluer2::CheckData()
   myWarningStatus=0;
   //
   aNbSG=myShapesToGlue.Extent();
+  aType=TopAbs_SHAPE;
   if (aNbSG) {
     // Check myShapesToGlue
     aItDMSLS.Initialize(myShapesToGlue);
@@ -441,7 +441,7 @@ void GEOMAlgo_Gluer2::FillContainers(const TopAbs_ShapeEnum aType)
       continue;
     }
     //
-    GEOMAlgo_Tools3D::MakeContainer(aType, aWnew);
+    GEOMAlgo_AlgoTools::MakeContainer(aType, aWnew);
     aWnew.Orientation(aW.Orientation());
     //
     aItS.Initialize(aW);
@@ -450,7 +450,7 @@ void GEOMAlgo_Gluer2::FillContainers(const TopAbs_ShapeEnum aType)
       if (myOrigins.IsBound(aE)) {
         aEnew=myOrigins.Find(aE);
         //
-        bToReverse=GEOMAlgo_Tools3D::IsSplitToReverse(aEnew, aE, myContext);
+        bToReverse=BOPTools_AlgoTools::IsSplitToReverse(aEnew, aE, myContext);
         if (bToReverse) {
           aEnew.Reverse();
         }
@@ -509,7 +509,7 @@ void GEOMAlgo_Gluer2::FillCompound(const TopoDS_Shape& aC)
     return;
   }
   //
-  GEOMAlgo_Tools3D::MakeContainer(TopAbs_COMPOUND, aCnew);
+  GEOMAlgo_AlgoTools::MakeContainer(TopAbs_COMPOUND, aCnew);
   //
   aItC.Initialize(aC);
   for (; aItC.More(); aItC.Next()) {
@@ -585,6 +585,7 @@ void GEOMAlgo_Gluer2::BuildResult()
   myErrorStatus=0;
   myWarningStatus=0;
   //
+  bHasImage=Standard_False;
   aItC.Initialize(myArgument);
   for (; aItC.More(); aItC.Next()) {
     const TopoDS_Shape& aCx=aItC.Value();
@@ -599,7 +600,7 @@ void GEOMAlgo_Gluer2::BuildResult()
     return;
   }
   //
-  GEOMAlgo_Tools3D::MakeContainer(TopAbs_COMPOUND, aCnew);
+  GEOMAlgo_AlgoTools::MakeContainer(TopAbs_COMPOUND, aCnew);
   //
   aItC.Initialize(myArgument);
   for (; aItC.More(); aItC.Next()) {
@@ -619,7 +620,7 @@ void GEOMAlgo_Gluer2::BuildResult()
     TopoDS_Shape aCnew1;
     TopTools_IndexedMapOfShape aM;
     //
-    GEOMAlgo_Tools3D::MakeContainer(TopAbs_COMPOUND, aCnew1);
+    GEOMAlgo_AlgoTools::MakeContainer(TopAbs_COMPOUND, aCnew1);
     //
     TopExp::MapShapes(aCnew, TopAbs_SOLID, aM);