Commit 86fb6feb authored by Charles Law's avatar Charles Law
Browse files

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

parent 1973b213
......@@ -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();
......
......@@ -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;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment