[vtk7] 06/24: update 70_fix_ftbfs_gcc49.patch

[Gert Wollny]

This is an automated email from the git hooks/post-receive script.

gewo pushed a commit to branch master
in repository vtk7.

commit 1d72d2e52c22bd720c9e87450ec9a623249ec1ab
Author: Gert Wollny <gewo at debian.org>
Date:   Sat Jul 8 10:18:32 2017 +0000

    update 70_fix_ftbfs_gcc49.patch
---
 debian/patches/70_fix_ftbfs_gcc49.patch | 40 ++++++++++++++++-----------------
 1 file changed, 19 insertions(+), 21 deletions(-)

diff --git a/debian/patches/70_fix_ftbfs_gcc49.patch b/debian/patches/70_fix_ftbfs_gcc49.patch
index adb9bb5..3116685 100644
--- a/debian/patches/70_fix_ftbfs_gcc49.patch
+++ b/debian/patches/70_fix_ftbfs_gcc49.patch
@@ -4,11 +4,9 @@ Bug-Debian: http://bugs.debian.org/746923
 Forwarded: https://github.com/Kitware/VTK/pull/7
 Last-Update: 2014-05-30
 
-Index: VTK-6.3.0/Filters/ParallelMPI/vtkDistributedDataFilter.cxx
-===================================================================
---- VTK-6.3.0.orig/Filters/ParallelMPI/vtkDistributedDataFilter.cxx
-+++ VTK-6.3.0/Filters/ParallelMPI/vtkDistributedDataFilter.cxx
-@@ -1112,7 +1112,10 @@ vtkDataSet *vtkDistributedDataFilter::Te
+--- a/Filters/ParallelMPI/vtkDistributedDataFilter.cxx
++++ b/Filters/ParallelMPI/vtkDistributedDataFilter.cxx
+@@ -1113,7 +1113,10 @@
    vtkIdType cellsPerNode = numTotalCells / nprocs;
  
    vtkIdList **sendCells = new vtkIdList * [ nprocs ];
@@ -19,8 +17,8 @@ Index: VTK-6.3.0/Filters/ParallelMPI/vtkDistributedDataFilter.cxx
 +  }
  
    if (numConsumers == nprocs - 1)
-     {
-@@ -1597,7 +1600,9 @@ vtkFloatArray **
+   {
+@@ -1598,7 +1601,9 @@
    // Exchange int arrays
  
    float **recvArrays = new float * [nprocs];
@@ -30,8 +28,8 @@ Index: VTK-6.3.0/Filters/ParallelMPI/vtkDistributedDataFilter.cxx
 +  }
  
    if (sendSize[me] > 0)  // sent myself an array
-     {
-@@ -1719,7 +1724,9 @@ vtkIdTypeArray **
+   {
+@@ -1720,7 +1725,9 @@
    // Exchange int arrays
  
    vtkIdType **recvArrays = new vtkIdType * [nprocs];
@@ -41,8 +39,8 @@ Index: VTK-6.3.0/Filters/ParallelMPI/vtkDistributedDataFilter.cxx
 +  }
  
    if (sendSize[me] > 0)  // sent myself an array
-     {
-@@ -2788,7 +2795,9 @@ void vtkDistributedDataFilter::AddConsta
+   {
+@@ -2789,7 +2796,9 @@
  
    unsigned char *vals = new unsigned char [npoints];
  
@@ -53,7 +51,7 @@ Index: VTK-6.3.0/Filters/ParallelMPI/vtkDistributedDataFilter.cxx
  
    vtkUnsignedCharArray *Array = vtkUnsignedCharArray::New();
    Array->SetName(arrayName);
-@@ -2808,7 +2817,9 @@ void vtkDistributedDataFilter::AddConsta
+@@ -2809,7 +2818,9 @@
  
    unsigned char *vals = new unsigned char [ncells];
  
@@ -64,7 +62,7 @@ Index: VTK-6.3.0/Filters/ParallelMPI/vtkDistributedDataFilter.cxx
  
    vtkUnsignedCharArray *Array = vtkUnsignedCharArray::New();
    Array->SetName(arrayName);
-@@ -3007,7 +3018,9 @@ int vtkDistributedDataFilter::AssignGlob
+@@ -3008,7 +3019,9 @@
    vtkIdType nGridPoints = grid->GetNumberOfPoints();
  
    vtkIdType *numPointsOutside = new vtkIdType [nprocs];
@@ -75,7 +73,7 @@ Index: VTK-6.3.0/Filters/ParallelMPI/vtkDistributedDataFilter.cxx
  
    vtkIdTypeArray *globalIds = vtkIdTypeArray::New();
    globalIds->SetNumberOfValues(nGridPoints);
-@@ -3089,10 +3102,16 @@ int vtkDistributedDataFilter::AssignGlob
+@@ -3090,10 +3103,16 @@
    // global ID back?
  
    vtkFloatArray **ptarrayOut = new vtkFloatArray * [nprocs];
@@ -94,8 +92,8 @@ Index: VTK-6.3.0/Filters/ParallelMPI/vtkDistributedDataFilter.cxx
  
    vtkIdType *next = new vtkIdType [nprocs];
    vtkIdType *next3 = new vtkIdType [nprocs];
-@@ -3267,7 +3286,9 @@ vtkIdTypeArray **vtkDistributedDataFilte
-     {
+@@ -3268,7 +3287,9 @@
+   {
      // There are no cells in my assigned region
  
 -    memset(gids, 0, sizeof(vtkIdTypeArray *) * nprocs);
@@ -104,8 +102,8 @@ Index: VTK-6.3.0/Filters/ParallelMPI/vtkDistributedDataFilter.cxx
 +    }
  
      return gids;
-     }
-@@ -3472,7 +3493,10 @@ vtkIdTypeArray **vtkDistributedDataFilte
+   }
+@@ -3473,7 +3494,10 @@
    std::multimap<int, int>::iterator mapIt;
  
    vtkIdTypeArray **processList = new vtkIdTypeArray * [nprocs];
@@ -116,8 +114,8 @@ Index: VTK-6.3.0/Filters/ParallelMPI/vtkDistributedDataFilter.cxx
 +  }
  
    for (int i=0; i<nprocs; i++)
-     {
-@@ -3562,7 +3586,9 @@ vtkIdTypeArray **vtkDistributedDataFilte
+   {
+@@ -3563,7 +3587,9 @@
    vtkIdType numPoints = grid->GetNumberOfPoints();
  
    vtkIdTypeArray **ghostPtIds = new vtkIdTypeArray * [nprocs];
@@ -127,4 +125,4 @@ Index: VTK-6.3.0/Filters/ParallelMPI/vtkDistributedDataFilter.cxx
 +  }
  
    if (numPoints < 1)
-     {
+   {

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/vtk7.git