products/patches/paraview-5.9_PARAVISADDONS.patch

   1 diff --git a/src/ElectromagnetismRotation/plugin/ElectromagnetismRotationIO/vtkElectromagnetismRotation.cxx b/src/ElectromagnetismRotation/plugin/ElectromagnetismRotationIO/vtkElectromagnetismRotation.cxx
   2 index dfe3af6..8107cb6 100644
   3 --- a/src/ElectromagnetismRotation/plugin/ElectromagnetismRotationIO/vtkElectromagnetismRotation.cxx
   4 +++ b/src/ElectromagnetismRotation/plugin/ElectromagnetismRotationIO/vtkElectromagnetismRotation.cxx
   5 @@ -26,7 +26,7 @@
   6  #include "VTKMEDTraits.hxx"
   7
   8  #include "vtkAdjacentVertexIterator.h"
   9 -#include "vtkDataArrayTemplate.h"
  10 +#include "vtkAOSDataArrayTemplate.h"
  11  #include "vtkIntArray.h"
  12  #include "vtkLongArray.h"
  13  #ifdef WIN32
  14 @@ -210,7 +210,7 @@ vtkDataSet *FilterFamilies(vtkThreshold *thres,
  15                             vtkDataSet *input, const std::set<int>& idsToKeep, bool insideOut, const char *arrNameOfFamilyField,
  16                             const char *associationForThreshold, bool& catchAll, bool& catchSmth)
  17  {
  18 -  const int VTK_DATA_ARRAY_DELETE=vtkDataArrayTemplate<double>::VTK_DATA_ARRAY_DELETE;
  19 +  const int VTK_DATA_ARRAY_DELETE=vtkAOSDataArrayTemplate<double>::VTK_DATA_ARRAY_DELETE;
  20    const char ZE_SELECTION_ARR_NAME[]="@@ZeSelection@@";
  21    vtkDataSet *output(input->NewInstance());
  22    output->ShallowCopy(input);
  23 diff --git a/src/ExtractThreeD/plugin/ExtractThreeDModule/vtkExtractThreeD.cxx b/src/ExtractThreeD/plugin/ExtractThreeDModule/vtkExtractThreeD.cxx
  24 index 208c6f3..5043cbc 100644
  25 --- a/src/ExtractThreeD/plugin/ExtractThreeDModule/vtkExtractThreeD.cxx
  26 +++ b/src/ExtractThreeD/plugin/ExtractThreeDModule/vtkExtractThreeD.cxx
  27 @@ -30,7 +30,7 @@
  28  #include <vtkCellData.h>
  29  #include <vtkCharArray.h>
  30  #include <vtkDataArraySelection.h>
  31 -#include <vtkDataArrayTemplate.h>
  32 +#include <vtkAOSDataArrayTemplate.h>
  33  #include <vtkDataObjectTreeIterator.h>
  34  #include <vtkDataSet.h>
  35  #include <vtkDataSetAttributes.h>
  36 @@ -156,7 +156,7 @@ int vtkExtractThreeD::RequestInformation(vtkInformation *request, vtkInformation
  37
  38  vtkDataSet *FilterFamilies(vtkDataSet *input, const std::vector<int> &idsToKeep)
  39  {
  40 -  const int VTK_DATA_ARRAY_DELETE = vtkDataArrayTemplate<double>::VTK_DATA_ARRAY_DELETE;
  41 +  const int VTK_DATA_ARRAY_DELETE = vtkAOSDataArrayTemplate<double>::VTK_DATA_ARRAY_DELETE;
  42    const char ZE_SELECTION_ARR_NAME[] = "@@ZeSelection@@";
  43    vtkDataSet *output(input->NewInstance());
  44    output->ShallowCopy(input);
  45 diff --git a/src/ZJFilter/plugin/ZJFilterModule/vtkZJFilter.cxx b/src/ZJFilter/plugin/ZJFilterModule/vtkZJFilter.cxx
  46 index 803049e..e257e58 100644
  47 --- a/src/ZJFilter/plugin/ZJFilterModule/vtkZJFilter.cxx
  48 +++ b/src/ZJFilter/plugin/ZJFilterModule/vtkZJFilter.cxx
  49 @@ -29,7 +29,7 @@
  50  #include <vtkCharArray.h>
  51  #include <vtkCompositeDataToUnstructuredGridFilter.h>
  52  #include <vtkDataArraySelection.h>
  53 -#include <vtkDataArrayTemplate.h>
  54 +#include <vtkAOSDataArrayTemplate.h>
  55  #include <vtkDataObjectTreeIterator.h>
  56  #include <vtkDataSet.h>
  57  #include <vtkDataSetAttributes.h>
  58 @@ -363,7 +363,7 @@ vtkDataSet* FilterFamilies(vtkZJFilter* zeBoss, vtkDataSet* input, const std::se
  59    bool catchAll, catchSmth;
  60    vtkNew<vtkThreshold> thres;
  61    thres->AddObserver(vtkCommand::ProgressEvent, zeBoss->InternalProgressObserver);
  62 -  constexpr int VTK_DATA_ARRAY_DELETE = vtkDataArrayTemplate<double>::VTK_DATA_ARRAY_DELETE;
  63 +  constexpr int VTK_DATA_ARRAY_DELETE = vtkAOSDataArrayTemplate<double>::VTK_DATA_ARRAY_DELETE;
  64    constexpr char ZE_SELECTION_ARR_NAME[] = "@@ZeSelection@@";
  65    constexpr char arrNameOfFamilyField[] = "FamilyIdCell";
  66    constexpr char associationForThreshold[] = "vtkDataObject::FIELD_ASSOCIATION_CELLS";