X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FPlugins%2FMEDReader%2FIO%2FvtkGenerateVectors.cxx;h=a3df978df03350889c0c990032aca83fede6678f;hb=f24ad457e027761c8df0671ba283a27af1ae3511;hp=10ac90587a78b63263937c4cbce709a82a5ac28d;hpb=7f8e0c7cf76d1cc0685c88844dfca7ae5dcb7071;p=modules%2Fparavis.git diff --git a/src/Plugins/MEDReader/IO/vtkGenerateVectors.cxx b/src/Plugins/MEDReader/IO/vtkGenerateVectors.cxx index 10ac9058..a3df978d 100644 --- a/src/Plugins/MEDReader/IO/vtkGenerateVectors.cxx +++ b/src/Plugins/MEDReader/IO/vtkGenerateVectors.cxx @@ -1,4 +1,4 @@ -// Copyright (C) 2010-2014 CEA/DEN, EDF R&D +// Copyright (C) 2010-2016 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 @@ -19,6 +19,7 @@ // Author : Anthony Geay #include "vtkGenerateVectors.h" +#include "vtkDataArrayTemplate.h" #include "vtkDoubleArray.h" #include "vtkInformation.h" #include "vtkQuadratureSchemeDefinition.h" @@ -70,7 +71,7 @@ void vtkGenerateVectors::Operate(vtkFieldData *fd) vtkDoubleArray *vtkGenerateVectors::Operate2Compo(vtkDoubleArray *oldArr) { - static const int VTK_DATA_ARRAY_FREE=vtkDataArrayTemplate::VTK_DATA_ARRAY_FREE; + const int VTK_DATA_ARRAY_FREE=vtkDataArrayTemplate::VTK_DATA_ARRAY_FREE; vtkDoubleArray *ret(vtkDoubleArray::New()); std::size_t nbOfTuples(oldArr->GetNumberOfTuples()); const double *inPt(oldArr->GetPointer(0)); @@ -93,7 +94,7 @@ vtkDoubleArray *vtkGenerateVectors::Operate2Compo(vtkDoubleArray *oldArr) vtkDoubleArray *vtkGenerateVectors::OperateMoreThan3Compo(vtkDoubleArray *oldArr) { - static const int VTK_DATA_ARRAY_FREE=vtkDataArrayTemplate::VTK_DATA_ARRAY_FREE; + const int VTK_DATA_ARRAY_FREE=vtkDataArrayTemplate::VTK_DATA_ARRAY_FREE; vtkDoubleArray *ret(vtkDoubleArray::New()); int nbOfCompo(oldArr->GetNumberOfComponents()); std::size_t nbOfTuples(oldArr->GetNumberOfTuples()); @@ -128,7 +129,7 @@ void vtkGenerateVectors::UpdateInformationOfArray(vtkDoubleArray *oldArr, vtkDou if(key->Has(oldArr->GetInformation())) { int dictSize(key->Size(oldArr->GetInformation())); - vtkQuadratureSchemeDefinition **dict(new vtkQuadratureSchemeDefinition *[dictSize]); + vtkQuadratureSchemeDefinition **dict = new vtkQuadratureSchemeDefinition *[dictSize]; key->GetRange(oldArr->GetInformation(),dict,0,0,dictSize); key->SetRange(arr->GetInformation(),dict,0,0,dictSize); delete [] dict;