VTK API change. Do not merge into ParaView-1-2

ParaView/Filters/vtkExtractCells.cxx

@@ -33,7 +33,7 @@
 #include <algorithm>
 #include <vtkstd/set>
 
-vtkCxxRevisionMacro(vtkExtractCells, "1.7");
+vtkCxxRevisionMacro(vtkExtractCells, "1.8");
 vtkStandardNewMacro(vtkExtractCells);
 
 vtkExtractCells::vtkExtractCells()
@@ -325,7 +325,7 @@ vtkIdList *vtkExtractCells::reMapPointIds(vtkDataSet *grid)
     this->SubSetUGridCellArraySize = 0;
   
     vtkIdType *cellArray = ugrid->GetCells()->GetPointer();
-    int *locs = ugrid->GetCellLocationsArray()->GetPointer(0);
+    vtkIdType *locs = ugrid->GetCellLocationsArray()->GetPointer(0);
 
     this->SubSetUGridCellArraySize = 0;
          
@@ -437,7 +437,7 @@ void vtkExtractCells::CopyCellsUnstructuredGrid(vtkIdList *ptMap)
 
   vtkstd::set<vtkIdType>::iterator cellPtr;                           // input
   vtkIdType *cells = ugrid->GetCells()->GetPointer();
-  int *locs = ugrid->GetCellLocationsArray()->GetPointer(0);
+  vtkIdType *locs = ugrid->GetCellLocationsArray()->GetPointer(0);
   vtkUnsignedCharArray *types = ugrid->GetCellTypesArray();
 
   for (cellPtr = this->CellList.begin();

ParaView/Filters/vtkMergeCells.cxx

@@ -40,7 +40,7 @@
 #include <stdlib.h>
 #include <algorithm>
 
-vtkCxxRevisionMacro(vtkMergeCells, "1.10");
+vtkCxxRevisionMacro(vtkMergeCells, "1.11");
 vtkStandardNewMacro(vtkMergeCells);
 
 vtkCxxSetObjectMacro(vtkMergeCells, UnstructuredGrid, vtkUnstructuredGrid);
@@ -378,7 +378,7 @@ vtkIdType vtkMergeCells::AddNewCellsUnstructuredGrid(vtkDataSet *set,
   
   vtkCellArray *cellArray = NULL;
   vtkIdType *cells = NULL;
-  int *locs = NULL;
+  vtkIdType *locs = NULL;
   unsigned char *types = NULL;
 
   int numCells = 0;