Commit 37c1e4a7 authored by Sean McBride's avatar Sean McBride
Browse files

Changed method declarations slightly from * to [] style

The explicit size gives the user more information as
to acceptible values.

Change-Id: I7baa5dbca7f1b6edbb67ca3139abefea6aebd02f
parent ed664cec
...@@ -1192,7 +1192,7 @@ void vtkXMLReader::GetProgressRange(float* range) ...@@ -1192,7 +1192,7 @@ void vtkXMLReader::GetProgressRange(float* range)
} }
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
void vtkXMLReader::SetProgressRange(const float* range, int curStep, int numSteps) void vtkXMLReader::SetProgressRange(const float range[2], int curStep, int numSteps)
{ {
float stepSize = (range[1] - range[0])/numSteps; float stepSize = (range[1] - range[0])/numSteps;
this->ProgressRange[0] = range[0] + stepSize*curStep; this->ProgressRange[0] = range[0] + stepSize*curStep;
...@@ -1201,7 +1201,7 @@ void vtkXMLReader::SetProgressRange(const float* range, int curStep, int numStep ...@@ -1201,7 +1201,7 @@ void vtkXMLReader::SetProgressRange(const float* range, int curStep, int numStep
} }
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
void vtkXMLReader::SetProgressRange(const float* range, int curStep, void vtkXMLReader::SetProgressRange(const float range[2], int curStep,
const float* fractions) const float* fractions)
{ {
float width = range[1] - range[0]; float width = range[1] - range[0];
......
...@@ -233,8 +233,8 @@ protected: ...@@ -233,8 +233,8 @@ protected:
// incrementally fine-tuned progress updates. // incrementally fine-tuned progress updates.
virtual void GetProgressRange(float* range); virtual void GetProgressRange(float* range);
virtual void SetProgressRange(const float* range, int curStep, int numSteps); virtual void SetProgressRange(const float range[2], int curStep, int numSteps);
virtual void SetProgressRange(const float* range, int curStep, const float* fractions); virtual void SetProgressRange(const float range[2], int curStep, const float* fractions);
virtual void UpdateProgressDiscrete(float progress); virtual void UpdateProgressDiscrete(float progress);
float ProgressRange[2]; float ProgressRange[2];
......
...@@ -2990,14 +2990,14 @@ void vtkXMLWriter::DestroyStringArray(int numStrings, char** strings) ...@@ -2990,14 +2990,14 @@ void vtkXMLWriter::DestroyStringArray(int numStrings, char** strings)
} }
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
void vtkXMLWriter::GetProgressRange(float* range) void vtkXMLWriter::GetProgressRange(float range[2])
{ {
range[0] = this->ProgressRange[0]; range[0] = this->ProgressRange[0];
range[1] = this->ProgressRange[1]; range[1] = this->ProgressRange[1];
} }
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
void vtkXMLWriter::SetProgressRange(const float* range, int curStep, int numSteps) void vtkXMLWriter::SetProgressRange(const float range[2], int curStep, int numSteps)
{ {
float stepSize = (range[1] - range[0])/numSteps; float stepSize = (range[1] - range[0])/numSteps;
this->ProgressRange[0] = range[0] + stepSize*curStep; this->ProgressRange[0] = range[0] + stepSize*curStep;
...@@ -3006,7 +3006,7 @@ void vtkXMLWriter::SetProgressRange(const float* range, int curStep, int numStep ...@@ -3006,7 +3006,7 @@ void vtkXMLWriter::SetProgressRange(const float* range, int curStep, int numStep
} }
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
void vtkXMLWriter::SetProgressRange(const float* range, int curStep, void vtkXMLWriter::SetProgressRange(const float range[2], int curStep,
const float* fractions) const float* fractions)
{ {
float width = range[1] - range[0]; float width = range[1] - range[0];
......
...@@ -420,9 +420,9 @@ protected: ...@@ -420,9 +420,9 @@ protected:
// The current range over which progress is moving. This allows for // The current range over which progress is moving. This allows for
// incrementally fine-tuned progress updates. // incrementally fine-tuned progress updates.
virtual void GetProgressRange(float* range); virtual void GetProgressRange(float range[2]);
virtual void SetProgressRange(const float* range, int curStep, int numSteps); virtual void SetProgressRange(const float range[2], int curStep, int numSteps);
virtual void SetProgressRange(const float* range, int curStep, const float* fractions); virtual void SetProgressRange(const float range[2], int curStep, const float* fractions);
virtual void SetProgressPartial(float fraction); virtual void SetProgressPartial(float fraction);
virtual void UpdateProgressDiscrete(float progress); virtual void UpdateProgressDiscrete(float progress);
float ProgressRange[2]; float ProgressRange[2];
......
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