Commit e5f4d073 authored by Jim Miller's avatar Jim Miller
Browse files

Removed unnecessary semi-colons

parent 2e3b64b3
......@@ -96,7 +96,7 @@ private:
inline unsigned char *vtkBitArray::GetPointer(const int id)
{
return this->Array + id/8;
};
}
// Description:
// Get the address of a particular data index. Make sure data is allocated
......
......@@ -119,7 +119,7 @@ protected:
// Description:
// Get the number of cells in the array.
inline int vtkCellArray::GetNumberOfCells() {return this->NumberOfCells;};
inline int vtkCellArray::GetNumberOfCells() {return this->NumberOfCells;}
// Description:
// Create a cell by specifying the number of points and an array of point id's.
......@@ -249,7 +249,7 @@ inline int vtkCellArray::GetNextCell(int& npts, int* &pts)
// Description:
// Get the size of the allocated connectivity array.
inline int vtkCellArray::GetSize() {return Ia->GetSize();};
inline int vtkCellArray::GetSize() {return Ia->GetSize();}
// Description:
// Get the total number of entries (i.e., data values) in the connectivity
......
......@@ -97,7 +97,7 @@ private:
// Description:
// Get a link structure given a point id.
inline _vtkLink_s &vtkCellLinks::GetLink(int ptId) {return this->Array[ptId];};
inline _vtkLink_s &vtkCellLinks::GetLink(int ptId) {return this->Array[ptId];}
// Description:
// Get the number of cells using the point specified by ptId.
......@@ -108,7 +108,7 @@ inline unsigned short vtkCellLinks::GetNcells(int ptId)
// Description:
// Return a list of cell ids using the point.
inline int *vtkCellLinks::GetCells(int ptId) {return this->Array[ptId].cells;};
inline int *vtkCellLinks::GetCells(int ptId) {return this->Array[ptId].cells;}
// Description:
// Increment the count of the number of cells using the point.
......
......@@ -92,7 +92,7 @@ private:
// Description:
// Get the data at a particular index.
inline char vtkCharArray::GetValue(const int id) {return this->Array[id];};
inline char vtkCharArray::GetValue(const int id) {return this->Array[id];}
// Description:
// Specify the number of values for this object to hold. Does an
......@@ -114,7 +114,7 @@ inline void vtkCharArray::SetValue(const int id, const char value)
// Description:
// Get the address of a particular data index.
inline char *vtkCharArray::GetPointer(const int id) {return this->Array + id;};
inline char *vtkCharArray::GetPointer(const int id) {return this->Array + id;}
// Description:
// Get the address of a particular data index. Make sure data is allocated
......@@ -152,19 +152,19 @@ inline void vtkCharArray::operator+=(const char c)
// Description:
// Resize object to just fit data requirement. Reclaims extra memory.
inline void vtkCharArray::Squeeze() {this->Resize (this->MaxId+1);};
inline void vtkCharArray::Squeeze() {this->Resize (this->MaxId+1);}
// Description:
// Get the allocated size of the object in terms of number of data items.
inline int vtkCharArray::GetSize() {return this->Size;};
inline int vtkCharArray::GetSize() {return this->Size;}
// Description:
// Returning the maximum index of data inserted so far.
inline int vtkCharArray::GetMaxId() {return this->MaxId;};
inline int vtkCharArray::GetMaxId() {return this->MaxId;}
// Description:
// Reuse the memory allocated by this object. Objects appears like
// no data has been previously inserted.
inline void vtkCharArray::Reset() {this->MaxId = -1;};
inline void vtkCharArray::Reset() {this->MaxId = -1;}
#endif
......@@ -92,7 +92,7 @@ private:
// Description:
// Get the data at a particular index.
inline double vtkDoubleArray::GetValue(const int id) {return this->Array[id];};
inline double vtkDoubleArray::GetValue(const int id) {return this->Array[id];}
// Description:
// Specify the number of values for this object to hold. Does an
......@@ -114,7 +114,7 @@ inline void vtkDoubleArray::SetValue(const int id, const double value)
// Description:
// Get the address of a particular data index.
inline double *vtkDoubleArray::GetPointer(const int id) {return this->Array + id;};
inline double *vtkDoubleArray::GetPointer(const int id) {return this->Array + id;}
// Description:
// Get the address of a particular data index. Make sure data is allocated
......@@ -152,19 +152,19 @@ inline void vtkDoubleArray::operator+=(const double f)
// Description:
// Resize object to just fit data requirement. Reclaims extra memory.
inline void vtkDoubleArray::Squeeze() {this->Resize (this->MaxId+1);};
inline void vtkDoubleArray::Squeeze() {this->Resize (this->MaxId+1);}
// Description:
// Get the allocated size of the object in terms of number of data items.
inline int vtkDoubleArray::GetSize() {return this->Size;};
inline int vtkDoubleArray::GetSize() {return this->Size;}
// Description:
// Returning the maximum index of data inserted so far.
inline int vtkDoubleArray::GetMaxId() {return this->MaxId;};
inline int vtkDoubleArray::GetMaxId() {return this->MaxId;}
// Description:
// Reuse the memory allocated by this object. Objects appear as if
// no data has been previously inserted.
inline void vtkDoubleArray::Reset() {this->MaxId = -1;};
inline void vtkDoubleArray::Reset() {this->MaxId = -1;}
#endif
......@@ -92,7 +92,7 @@ private:
// Description:
// Get the data at a particular index.
inline float vtkFloatArray::GetValue(const int id) {return this->Array[id];};
inline float vtkFloatArray::GetValue(const int id) {return this->Array[id];}
// Description:
// Specify the number of values for this object to hold. Does an
......@@ -114,7 +114,7 @@ inline void vtkFloatArray::SetValue(const int id, const float value)
// Description:
// Get the address of a particular data index.
inline float *vtkFloatArray::GetPointer(const int id) {return this->Array + id;};
inline float *vtkFloatArray::GetPointer(const int id) {return this->Array + id;}
// Description:
// Get the address of a particular data index. Make sure data is allocated
......@@ -152,19 +152,19 @@ inline void vtkFloatArray::operator+=(const float f)
// Description:
// Resize object to just fit data requirement. Reclaims extra memory.
inline void vtkFloatArray::Squeeze() {this->Resize (this->MaxId+1);};
inline void vtkFloatArray::Squeeze() {this->Resize (this->MaxId+1);}
// Description:
// Get the allocated size of the object in terms of number of data items.
inline int vtkFloatArray::GetSize() {return this->Size;};
inline int vtkFloatArray::GetSize() {return this->Size;}
// Description:
// Returning the maximum index of data inserted so far.
inline int vtkFloatArray::GetMaxId() {return this->MaxId;};
inline int vtkFloatArray::GetMaxId() {return this->MaxId;}
// Description:
// Reuse the memory allocated by this object. Object appears as if
// no data has been previously inserted.
inline void vtkFloatArray::Reset() {this->MaxId = -1;};
inline void vtkFloatArray::Reset() {this->MaxId = -1;}
#endif
......@@ -143,7 +143,7 @@ inline int vtkIdList::InsertUniqueId(const int id)
// Description:
// Get a pointer to a particular data index.
inline int *vtkIdList::GetPointer(const int i) {return this->Ia->GetPointer(i);};
inline int *vtkIdList::GetPointer(const int i) {return this->Ia->GetPointer(i);}
// Description:
// Get a pointer to a particular data index. Make sure data is allocated
......
......@@ -92,7 +92,7 @@ private:
// Description:
// Get the data at a particular index.
inline int vtkIntArray::GetValue(const int id) {return this->Array[id];};
inline int vtkIntArray::GetValue(const int id) {return this->Array[id];}
// Description:
// Specify the number of values for this object to hold. Does an
......@@ -114,7 +114,7 @@ inline void vtkIntArray::SetValue(const int id, const int value)
// Description:
// Get the address of a particular data index.
inline int *vtkIntArray::GetPointer(const int id) {return this->Array + id;};
inline int *vtkIntArray::GetPointer(const int id) {return this->Array + id;}
// Description:
// Get the address of a particular data index. Make sure data is allocated
......@@ -152,19 +152,19 @@ inline void vtkIntArray::operator+=(const int i)
// Description:
// Resize object to just fit data requirement. Reclaims extra memory.
inline void vtkIntArray::Squeeze() {this->Resize (this->MaxId+1);};
inline void vtkIntArray::Squeeze() {this->Resize (this->MaxId+1);}
// Description:
// Get the allocated size of the object in terms of number of data items.
inline int vtkIntArray::GetSize() {return this->Size;};
inline int vtkIntArray::GetSize() {return this->Size;}
// Description:
// Return the maximum index of data inserted so far.
inline int vtkIntArray::GetMaxId() {return this->MaxId;};
inline int vtkIntArray::GetMaxId() {return this->MaxId;}
// Description:
// Reuse the memory allocated by this object. Objects appear as if
// no data has been previously inserted.
inline void vtkIntArray::Reset() {this->MaxId = -1;};
inline void vtkIntArray::Reset() {this->MaxId = -1;}
#endif
......@@ -255,7 +255,7 @@ void vtkPointData::Initialize()
this->UserDefined->UnRegister(this);
this->UserDefined = NULL;
}
};
}
// Description:
// Pass entire arrays of input data through to output. Obey the "copy"
......@@ -337,7 +337,7 @@ void vtkPointData::CopyAllocate(vtkPointData* pd, int sze, int ext)
this->SetUserDefined(newUserDefined);
newUserDefined->Delete();
}
};
}
// do it this way because some compilers don't initialize file scope statics
......
......@@ -111,7 +111,7 @@ inline float vtkPriorityQueue::DeleteId(int id)
this->Pop(priority,loc);
}
return priority;
};
}
// Description:
// Get the priority of an entry in the queue with specified id. Returns priority
......@@ -126,6 +126,6 @@ inline float vtkPriorityQueue::GetPriority(int id)
return this->Array[loc].priority;
}
return VTK_LARGE_FLOAT;
};
}
#endif
......@@ -91,7 +91,7 @@ public:
void SetCompositingOperatorToSrc() {this->CompositingOperator = VTK_SRC;};
void SetCompositingOperatorToWhite() {this->CompositingOperator = VTK_WHITE;};
void Render (vtkViewport* viewport) { viewport;}
void Render (vtkViewport* vtkNotUsed(viewport)) {}
protected:
float Color[3];
......
......@@ -58,6 +58,13 @@ int vtkShortArray::Allocate(const int sz, const int ext)
return 1;
}
void vtkShortArray::SetArray(short *ptr, int size)
{
this->Size = size;
this->Array = ptr;
this->MaxId = size -1;
}
// Description:
// Release storage and reset array to initial state.
void vtkShortArray::Initialize()
......
......@@ -82,6 +82,13 @@ public:
int GetMaxId();
void Reset();
// Description:
// secret voodoo method to get a raw pointer into this object
// once into this object you still own the pointer. You must free
// it. Just don't free it before this object is done using it.
// the size is the number of short scalars, NOT the number of bytes.
void SetArray(short *, int size);
private:
short *Array; // pointer to data
int Size; // allocated size of data
......@@ -92,7 +99,7 @@ private:
// Description:
// Get the data at a particular index.
inline short vtkShortArray::GetValue(const int id) {return this->Array[id];};
inline short vtkShortArray::GetValue(const int id) {return this->Array[id];}
// Description:
// Specify the number of values for this object to hold. Does an
......@@ -114,7 +121,7 @@ inline void vtkShortArray::SetValue(const int id, const short value)
// Description:
// Get the address of a particular data index.
inline short *vtkShortArray::GetPointer(const int id) {return this->Array + id;};
inline short *vtkShortArray::GetPointer(const int id) {return this->Array + id;}
// Description:
// Get the address of a particular data index. Make sure data is allocated
......@@ -152,19 +159,19 @@ inline void vtkShortArray::operator+=(const short i)
// Description:
// Resize object to just fit data requirement. Reclaims extra memory.
inline void vtkShortArray::Squeeze() {this->Resize (this->MaxId+1);};
inline void vtkShortArray::Squeeze() {this->Resize (this->MaxId+1);}
// Description:
// Get the allocated size of the object in terms of number of data items.
inline int vtkShortArray::GetSize() {return this->Size;};
inline int vtkShortArray::GetSize() {return this->Size;}
// Description:
// Returning the maximum index of data inserted so far.
inline int vtkShortArray::GetMaxId() {return this->MaxId;};
inline int vtkShortArray::GetMaxId() {return this->MaxId;}
// Description:
// Reuse the memory allocated by this object. Objects appears like
// no data has been previously inserted.
inline void vtkShortArray::Reset() {this->MaxId = -1;};
inline void vtkShortArray::Reset() {this->MaxId = -1;}
#endif
......@@ -90,6 +90,10 @@ public:
void operator+=(const vtkShortScalars& ss) {*(this->S) += *(ss.S);};
void Reset() {this->S->Reset();};
// Used by vtkImageToStructuredPoints (Proper length array is up to user!)
vtkSetReferenceCountedObjectMacro(S, vtkShortArray);
vtkGetObjectMacro(S, vtkShortArray);
protected:
vtkShortArray *S;
};
......
......@@ -92,7 +92,7 @@ private:
// Description:
// Get the data at a particular index.
inline unsigned char vtkUnsignedCharArray::GetValue(const int id) {return this->Array[id];};
inline unsigned char vtkUnsignedCharArray::GetValue(const int id) {return this->Array[id];}
// Description:
// Specify the number of values for this object to hold. Does an
......@@ -114,7 +114,7 @@ inline void vtkUnsignedCharArray::SetValue(const int id, const unsigned char val
// Description:
// Get the address of a particular data index.
inline unsigned char *vtkUnsignedCharArray::GetPointer(const int id) {return this->Array + id;};
inline unsigned char *vtkUnsignedCharArray::GetPointer(const int id) {return this->Array + id;}
// Description:
// Get the address of a particular data index. Make sure data is allocated
......@@ -152,19 +152,19 @@ inline void vtkUnsignedCharArray::operator+=(const unsigned char c)
// Description:
// Resize object to just fit data requirement. Reclaims extra memory.
inline void vtkUnsignedCharArray::Squeeze() {this->Resize (this->MaxId+1);};
inline void vtkUnsignedCharArray::Squeeze() {this->Resize (this->MaxId+1);}
// Description:
// Get the allocated size of the object in terms of number of data items.
inline int vtkUnsignedCharArray::GetSize() {return this->Size;};
inline int vtkUnsignedCharArray::GetSize() {return this->Size;}
// Description:
// Returning the maximum index of data inserted so far.
inline int vtkUnsignedCharArray::GetMaxId() {return this->MaxId;};
inline int vtkUnsignedCharArray::GetMaxId() {return this->MaxId;}
// Description:
// Reuse the memory allocated by this object. Objects appears like
// no data has been previously inserted.
inline void vtkUnsignedCharArray::Reset() {this->MaxId = -1;};
inline void vtkUnsignedCharArray::Reset() {this->MaxId = -1;}
#endif
......@@ -58,6 +58,13 @@ int vtkUnsignedShortArray::Allocate(const int sz, const int ext)
return 1;
}
void vtkUnsignedShortArray::SetArray(unsigned short *ptr, int size)
{
this->Size = size;
this->Array = ptr;
this->MaxId = size -1;
}
// Description:
// Release storage and reset array to initial state.
void vtkUnsignedShortArray::Initialize()
......
......@@ -82,6 +82,13 @@ public:
int GetMaxId();
void Reset();
// Description:
// secret voodoo method to get a raw pointer into this object
// once into this object you still own the pointer. You must free
// it. Just don't free it before this object is done using it.
// the size is the number of short scalars, NOT the number of bytes.
void SetArray(unsigned short *, int size);
private:
unsigned short *Array; // pointer to data
int Size; // allocated size of data
......@@ -92,7 +99,7 @@ private:
// Description:
// Get the data at a particular index.
inline unsigned short vtkUnsignedShortArray::GetValue(const int id) {return this->Array[id];};
inline unsigned short vtkUnsignedShortArray::GetValue(const int id) {return this->Array[id];}
// Description:
// Specify the number of values for this object to hold. Does an
......@@ -114,7 +121,7 @@ inline void vtkUnsignedShortArray::SetValue(const int id, const unsigned short v
// Description:
// Get the address of a particular data index.
inline unsigned short *vtkUnsignedShortArray::GetPointer(const int id) {return this->Array + id;};
inline unsigned short *vtkUnsignedShortArray::GetPointer(const int id) {return this->Array + id;}
// Description:
// Get the address of a particular data index. Make sure data is allocated
......@@ -152,20 +159,20 @@ inline void vtkUnsignedShortArray::operator+=(const unsigned short i)
// Description:
// Resize object to just fit data requirement. Reclaims extra memory.
inline void vtkUnsignedShortArray::Squeeze() {this->Resize (this->MaxId+1);};
inline void vtkUnsignedShortArray::Squeeze() {this->Resize (this->MaxId+1);}
// Description:
// Get the allocated size of the object in terms of number of data items.
inline int vtkUnsignedShortArray::GetSize() {return this->Size;};
inline int vtkUnsignedShortArray::GetSize() {return this->Size;}
// Description:
// Returning the maximum index of data inserted so far.
inline int vtkUnsignedShortArray::GetMaxId() {return this->MaxId;};
inline int vtkUnsignedShortArray::GetMaxId() {return this->MaxId;}
// Description:
// Reuse the memory allocated by this object. Objects appears like
// no data has been previously inserted.
inline void vtkUnsignedShortArray::Reset() {this->MaxId = -1;};
inline void vtkUnsignedShortArray::Reset() {this->MaxId = -1;}
#endif
......
......@@ -90,6 +90,10 @@ public:
void operator+=(const vtkUnsignedShortScalars& cs) {*(this->S) += *(cs.S);};
void Reset() {this->S->Reset();};
// Used by vtkImageToStructuredPoints (Proper length array is up to user!)
vtkSetReferenceCountedObjectMacro(S, vtkUnsignedShortArray);
vtkGetObjectMacro(S, vtkUnsignedShortArray);
protected:
vtkUnsignedShortArray *S;
};
......
......@@ -157,11 +157,11 @@ protected:
// Description:
// Convert display (or screen) coordinates to world coordinates.
inline void vtkViewport::DisplayToWorld() {DisplayToView(); ViewToWorld();};
inline void vtkViewport::DisplayToWorld() {DisplayToView(); ViewToWorld();}
// Description:
// Convert world point coordinates to display (or screen) coordinates.
inline void vtkViewport::WorldToDisplay() {WorldToView(); ViewToDisplay();};
inline void vtkViewport::WorldToDisplay() {WorldToView(); ViewToDisplay();}
#endif
......@@ -92,7 +92,7 @@ private:
// Description:
// Get the data at a particular index.
inline void* vtkVoidArray::GetValue(const int id) {return this->Array[id];};
inline void* vtkVoidArray::GetValue(const int id) {return this->Array[id];}
// Description:
// Specify the number of values for this object to hold. Does an
......@@ -114,7 +114,7 @@ inline void vtkVoidArray::SetValue(const int id, void *value)
// Description:
// Get the address of a particular data index.
inline void** vtkVoidArray::GetPointer(const int id) {return this->Array + id;};
inline void** vtkVoidArray::GetPointer(const int id) {return this->Array + id;}
// Description:
// Get the address of a particular data index. Make sure data is allocated
......@@ -152,19 +152,19 @@ inline void vtkVoidArray::operator+=(void* p)
// Description:
// Resize object to just fit data requirement. Reclaims extra memory.
inline void vtkVoidArray::Squeeze() {this->Resize (this->MaxId+1);};
inline void vtkVoidArray::Squeeze() {this->Resize (this->MaxId+1);}
// Description:
// Get the allocated size of the object in terms of number of data items.
inline int vtkVoidArray::GetSize() {return this->Size;};
inline int vtkVoidArray::GetSize() {return this->Size;}
// Description:
// Returning the maximum index of data inserted so far.
inline int vtkVoidArray::GetMaxId() {return this->MaxId;};
inline int vtkVoidArray::GetMaxId() {return this->MaxId;}
// Description:
// Reuse the memory allocated by this object. Objects appears like
// no data has been previously inserted.
inline void vtkVoidArray::Reset() {this->MaxId = -1;};
inline void vtkVoidArray::Reset() {this->MaxId = -1;}
#endif
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