Commit 232b557c authored by Sean McBride's avatar Sean McBride

Change vtkCellArray::Allocate to take vtkIdType

This way it matches other Allocate methods.

Removed unneeded ‘const’ for vtkIdType parameters.

Other misc cleanup while review some vtkDataSet stuff.
parent ef35b546
......@@ -20,7 +20,7 @@
*
* vtkGenericDataArray specialization that stores data array in the traditional
* VTK memory layout where a 3 component is stored in contiguous memory as
* \c A1A2A2B1B2B3C1C2C3 ... where A,B,C,... are tuples.
* \c A1A2A3B1B2B3C1C2C3 ... where A,B,C,... are tuples.
*
* This replaces vtkDataArrayTemplate.
*
......
......@@ -115,7 +115,7 @@ vtkMTimeType vtkPoints::GetMTime()
return doTime;
}
int vtkPoints::Allocate(const vtkIdType sz, const vtkIdType ext)
int vtkPoints::Allocate(vtkIdType sz, vtkIdType ext)
{
int numComp = this->Data->GetNumberOfComponents();
return this->Data->Allocate(sz * numComp, ext * numComp);
......
......@@ -44,7 +44,7 @@ public:
/**
* Allocate initial memory size. ext is no longer used.
*/
virtual int Allocate(const vtkIdType sz, const vtkIdType ext = 1000);
virtual int Allocate(vtkIdType sz, vtkIdType ext = 1000);
/**
* Return object to instantiated state.
......
......@@ -126,7 +126,7 @@ void vtkPoints2D::GetBounds(double bounds[4])
memcpy(bounds, this->Bounds, 4 * sizeof(double));
}
int vtkPoints2D::Allocate(const vtkIdType sz, const vtkIdType ext)
int vtkPoints2D::Allocate(vtkIdType sz, vtkIdType ext)
{
int numComp = this->Data->GetNumberOfComponents();
return this->Data->Allocate(sz * numComp, ext * numComp);
......
......@@ -44,7 +44,7 @@ public:
/**
* Allocate initial memory size. ext is no longer used.
*/
virtual int Allocate(const vtkIdType sz, const vtkIdType ext = 1000);
virtual int Allocate(vtkIdType sz, vtkIdType ext = 1000);
/**
* Return object to instantiated state.
......
......@@ -29,7 +29,7 @@ vtkPriorityQueue::vtkPriorityQueue()
// Allocate priority queue with specified size and amount to extend
// queue (if reallocation required).
void vtkPriorityQueue::Allocate(const vtkIdType sz, const vtkIdType ext)
void vtkPriorityQueue::Allocate(vtkIdType sz, vtkIdType ext)
{
this->ItemLocation->Allocate(sz,ext);
for (vtkIdType i=0; i < sz; i++)
......
......@@ -65,7 +65,7 @@ public:
/**
* Allocate initial space for priority queue.
*/
void Allocate(const vtkIdType sz, const vtkIdType ext=1000);
void Allocate(vtkIdType sz, vtkIdType ext=1000);
/**
* Insert id with priority specified. The id is generally an
......
......@@ -55,7 +55,7 @@ public:
/**
* Allocate memory and set the size to extend by.
*/
int Allocate(const vtkIdType sz, const int ext=1000)
int Allocate(vtkIdType sz, vtkIdType ext=1000)
{return this->Ia->Allocate(sz,ext);}
/**
......
......@@ -240,7 +240,7 @@ void vtkFieldData::Initialize()
//----------------------------------------------------------------------------
// Allocate data for each array.
int vtkFieldData::Allocate(const vtkIdType sz, const vtkIdType ext)
int vtkFieldData::Allocate(vtkIdType sz, vtkIdType ext)
{
int i;
int status = 0;
......
......@@ -68,7 +68,7 @@ public:
* Allocate data for each array.
* Note that ext is no longer used.
*/
int Allocate(const vtkIdType sz, const vtkIdType ext=1000);
int Allocate(vtkIdType sz, vtkIdType ext=1000);
/**
* Copy data array structure from a given field. The same arrays
......
......@@ -193,7 +193,7 @@ public:
//@{
/**
* Return the number of primitives of a particular type held..
* Return the number of primitives of a particular type held.
*/
vtkIdType GetNumberOfVerts();
vtkIdType GetNumberOfLines();
......
......@@ -14,7 +14,7 @@
=========================================================================*/
/**
* @class vtkThreadedImageAlgorithm
* @brief Generic filter that has one input..
* @brief Generic filter that has one input.
*
* vtkThreadedImageAlgorithm is a filter superclass that hides much of the
* pipeline complexity. It handles breaking the pipeline execution
......
......@@ -12,7 +12,7 @@ vector-valued. Only the information objects attached to arrays are encoded.
A block of metadata may immediately follow the specification of an array.
Whitespace is permitted between the array data and the opening `METADATA` tag.
The metadata block is terminated by an empty line..
The metadata block is terminated by an empty line.
```
# vtk DataFile Version 4.1
......
......@@ -440,7 +440,7 @@ pack $gui -side top -anchor s -fill x -expand yes
#
# We set the window manager (wm command) so that it registers a
# command to handle the WM_DELETE_WINDOW protocol request..
# command to handle the WM_DELETE_WINDOW protocol request.
#
wm title . "Texture mapper/transform demo"
wm protocol . WM_DELETE_WINDOW ::vtk::cb_exit
......
......@@ -257,7 +257,7 @@ int vtkMassProperties::RequestData(
this->MinCellArea = mincellarea;
this->MaxCellArea = maxcellarea;
// Weighting factors in Discrete Divergence theorem for volume calculation..
// Weighting factors in Discrete Divergence theorem for volume calculation.
//
kxyz[0] = (munc[0] + (wxyz/3.0) + ((wxy+wxz)/2.0)) /numCells;
kxyz[1] = (munc[1] + (wxyz/3.0) + ((wxy+wyz)/2.0)) /numCells;
......
......@@ -636,7 +636,7 @@ void ContourRectilinearGrid(vtkRectilinearSynchronizedTemplates *self, int *exEx
inPtrX += xInc;
isect2Ptr += 3;
isect1Ptr += 3;
// To keep track of ids for copying cell attributes..
// To keep track of ids for copying cell attributes.
++inCellId;
}
inPtrY += yInc;
......
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