Commit a4c8e855 authored by Berk Geveci's avatar Berk Geveci Committed by George Zagaris
Browse files

Fixed compiler warnings.

Change-Id: I80d4dbda38c7a6d83d6ba3fadeb81cce1154a1b1
parent bc4dbe82
...@@ -456,7 +456,7 @@ int vtkParticleTracerBase::InitializeInterpolator() ...@@ -456,7 +456,7 @@ int vtkParticleTracerBase::InitializeInterpolator()
inp->ComputeBounds(); inp->ComputeBounds();
inp->GetBounds(&bbox.b[0]); inp->GetBounds(&bbox.b[0]);
this->CachedBounds[T].push_back(bbox); this->CachedBounds[T].push_back(bbox);
bool static_dataset = this->StaticMesh == 0 ? false : true; bool static_dataset = (this->StaticMesh != 0);
this->AllFixedGeometry = this->AllFixedGeometry && static_dataset; this->AllFixedGeometry = this->AllFixedGeometry && static_dataset;
// add the dataset to the interpolator // add the dataset to the interpolator
this->Interpolator->SetDataSetAtTime(index++, T, this->GetCacheDataTime(T), inp, static_dataset); this->Interpolator->SetDataSetAtTime(index++, T, this->GetCacheDataTime(T), inp, static_dataset);
......
...@@ -406,7 +406,7 @@ int vtkTemporalStreamTracer::InitializeInterpolator() ...@@ -406,7 +406,7 @@ int vtkTemporalStreamTracer::InitializeInterpolator()
inp->ComputeBounds(); inp->ComputeBounds();
inp->GetBounds(&bbox.b[0]); inp->GetBounds(&bbox.b[0]);
this->CachedBounds[T].push_back(bbox); this->CachedBounds[T].push_back(bbox);
bool static_dataset = this->StaticMesh == 0 ? false : true; bool static_dataset = (this->StaticMesh != 0);
this->AllFixedGeometry = this->AllFixedGeometry && static_dataset; this->AllFixedGeometry = this->AllFixedGeometry && static_dataset;
// add the dataset to the interpolator // add the dataset to the interpolator
this->Interpolator->SetDataSetAtTime(index++, T, this->CurrentTimeSteps[T], inp, static_dataset); this->Interpolator->SetDataSetAtTime(index++, T, this->CurrentTimeSteps[T], inp, static_dataset);
......
...@@ -101,7 +101,6 @@ int vtkTransmitStructuredDataPiece::RequestData( ...@@ -101,7 +101,6 @@ int vtkTransmitStructuredDataPiece::RequestData(
procId = this->Controller->GetLocalProcessId(); procId = this->Controller->GetLocalProcessId();
if (procId == 0) if (procId == 0)
{ {
vtkInformation *inInfo = inputVector[0]->GetInformationObject(0);
vtkDataSet *input = vtkDataSet::GetData(inputVector[0]); vtkDataSet *input = vtkDataSet::GetData(inputVector[0]);
this->RootExecute(input, output, outInfo); this->RootExecute(input, output, outInfo);
} }
......
...@@ -333,7 +333,6 @@ int vtkPDataSetWriter::WriteUnstructuredMetaData(vtkDataSet *input, ...@@ -333,7 +333,6 @@ int vtkPDataSetWriter::WriteUnstructuredMetaData(vtkDataSet *input,
int vtkPDataSetWriter::WriteImageMetaData(vtkImageData * input, int vtkPDataSetWriter::WriteImageMetaData(vtkImageData * input,
char *root, char *str, ostream *fptr) char *root, char *str, ostream *fptr)
{ {
int i;
int *pi; int *pi;
double *pf; double *pf;
vtkInformation* inInfo = this->GetInputInformation(); vtkInformation* inInfo = this->GetInputInformation();
...@@ -433,7 +432,7 @@ int vtkPDataSetWriter::WriteImageMetaData(vtkImageData * input, ...@@ -433,7 +432,7 @@ int vtkPDataSetWriter::WriteImageMetaData(vtkImageData * input,
delete[] sendBuffer; delete[] sendBuffer;
} }
for (i = 0; i < this->NumberOfPieces; ++i) for (int i = 0; i < this->NumberOfPieces; ++i)
{ {
pi = &this->Extents[i][0]; pi = &this->Extents[i][0];
sprintf(str, this->FilePattern, root, i); sprintf(str, this->FilePattern, root, i);
......
...@@ -386,12 +386,11 @@ void vtkGlyph3DMapper::PrintSelf(ostream& os, vtkIndent indent) ...@@ -386,12 +386,11 @@ void vtkGlyph3DMapper::PrintSelf(ostream& os, vtkIndent indent)
int vtkGlyph3DMapper::RequestUpdateExtent( int vtkGlyph3DMapper::RequestUpdateExtent(
vtkInformation *vtkNotUsed(request), vtkInformation *vtkNotUsed(request),
vtkInformationVector **inputVector, vtkInformationVector **inputVector,
vtkInformationVector *outputVector) vtkInformationVector *)
{ {
// get the info objects // get the info objects
vtkInformation *inInfo = inputVector[0]->GetInformationObject(0); vtkInformation *inInfo = inputVector[0]->GetInformationObject(0);
vtkInformation *sourceInfo = inputVector[1]->GetInformationObject(0); vtkInformation *sourceInfo = inputVector[1]->GetInformationObject(0);
vtkInformation *outInfo = outputVector->GetInformationObject(0);
if (sourceInfo) if (sourceInfo)
{ {
......
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