Merge branch 'master' of https://codev-tuleap.cea.fr/plugins/git/salome/shaper

[modules/shaper.git] / src / Model / Model_AttributeTables.cpp

diff --git a/src/Model/Model_AttributeTables.cpp b/src/Model/Model_AttributeTables.cpp
index f8eebe405a4bd3140081954fd536f0aafde87240..c0e79e4d0791ab5c7525ba2f8d57146b78ab63c7 100644 (file)
--- a/src/Model/Model_AttributeTables.cpp
+++ b/src/Model/Model_AttributeTables.cpp
@@ -1,8 +1,21 @@
-// Copyright (C) 2014-20xx CEA/DEN, EDF R&D
-
-// File:        Model_AttributeTables.cpp
-// Created:     14 Nov 2016
-// Author:      Mikhail Ponikarov
+// Copyright (C) 2014-2020  CEA/DEN, EDF R&D
+//
+// 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, 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
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
 #include "Model_AttributeTables.h"
 
@@ -61,9 +74,6 @@ void Model_AttributeTables::setSize(const int theRows, const int theColumns, con
         (myType == ModelAPI_AttributeTables::DOUBLE) ?
         new TColStd_HArray1OfReal(0, aNewSize - 1) : Handle(TColStd_HArray1OfReal)();
       bool* anOldBool = 0; // an not work with internal arrays because of different indexing
-      Handle(TColStd_HArray1OfByte) aNewBool = (myType == ModelAPI_AttributeTables::BOOLEAN) ?
-        // internal array for boolean has 8 times lower size
-        new TColStd_HArray1OfByte(0, (aNewSize - 1)>>3) : Handle(TColStd_HArray1OfByte)();
       Handle(TDataStd_BooleanArray) aBoolArray; // an existing array
       Handle(TColStd_HArray1OfInteger) anOldInt, aNewInt =
         (myType == ModelAPI_AttributeTables::INTEGER) ?
@@ -84,7 +94,7 @@ void Model_AttributeTables::setSize(const int theRows, const int theColumns, con
           aBoolArray = Handle(TDataStd_BooleanArray)::DownCast(anArray);
           for(int a = 0; a < aSize; a++)
             anOldBool[a] = aBoolArray->Value(a);
-          aBoolArray->SetInternalArray(aNewBool);
+          aBoolArray->Init(0, aNewSize - 1);
           break;
         }
         case ModelAPI_AttributeTables::INTEGER: