Merge from V6_3_BR 06/06/2011

[modules/geom.git] / src / STEPImport / STEPImport.cxx

diff --git a/src/STEPImport/STEPImport.cxx b/src/STEPImport/STEPImport.cxx
index 05503980521931e8cd4d7266bea56528ba052f4e..22f0dee18fb7ec1dbdadf10485f3195d5255d913 100644 (file)
--- a/src/STEPImport/STEPImport.cxx
+++ b/src/STEPImport/STEPImport.cxx
@@ -1,23 +1,23 @@
-//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2011  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
+// 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 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
-//  Lesser General Public License for more details.
+// 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
-//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+// 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/ or email : webmaster.salome@opencascade.com
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 //  File:        STEPImport.cxx
 //  Created:     Wed May 19 14:41:10 2004
@@ -131,6 +131,21 @@ extern "C"
           /* For a single entity */
           else if (nbr == 1 && nbs == 1) {
             aResShape = aReader.Shape(1);
+            // ATTENTION: this is a workaround for mantis issue 0020442 remark 0010776
+            // It should be removed after patching OCCT for bug OCC22436
+            // (fix for OCCT is expected in service pack next to OCCT6.3sp12)
+            if (aResShape.ShapeType() == TopAbs_COMPOUND) {
+              int nbSub1 = 0;
+              TopoDS_Shape currShape;
+              TopoDS_Iterator It (aResShape, Standard_True, Standard_True);
+              for (; It.More(); It.Next()) {
+                nbSub1++;
+                currShape = It.Value();
+              }
+              if (nbSub1 == 1)
+                aResShape = currShape;
+            }
+            // END workaround
             break;
           }