Commit 6b649e48 authored by Sean McBride's avatar Sean McBride Committed by David Partyka
Browse files

COMP: fixed yet more clang warnings, minor stuff

Change-Id: Ica6dedd147152533b7cc8b5f6f9b598ba86f3aee
parent 7a19192d
...@@ -2029,7 +2029,7 @@ int vtkPolynomialSolversUnivariate::SolveCubic( double c0, double c1, double c2, ...@@ -2029,7 +2029,7 @@ int vtkPolynomialSolversUnivariate::SolveCubic( double c0, double c1, double c2,
} }
// Reduce Number Of Roots To One // Reduce Number Of Roots To One
if( (*r1 == *r2) ) if( *r1 == *r2 )
{ {
*num_roots = 1; *num_roots = 1;
} }
......
...@@ -540,7 +540,7 @@ int vtkRectilinearGridToTetrahedra::RequestData( ...@@ -540,7 +540,7 @@ int vtkRectilinearGridToTetrahedra::RequestData(
if (this->TetraPerCell == VTK_VOXEL_TO_5_AND_12_TET) if (this->TetraPerCell == VTK_VOXEL_TO_5_AND_12_TET)
{ {
vtkDataArray *TempVoxelSubdivisionType = RectGrid->GetCellData()->GetScalars(); vtkDataArray *TempVoxelSubdivisionType = RectGrid->GetCellData()->GetScalars();
if((TempVoxelSubdivisionType == NULL)) if(TempVoxelSubdivisionType == NULL)
{ {
vtkErrorMacro(<< "Scalars to input Should be set!"); vtkErrorMacro(<< "Scalars to input Should be set!");
return 1; return 1;
......
...@@ -137,11 +137,10 @@ GetButtonProp(int i) ...@@ -137,11 +137,10 @@ GetButtonProp(int i)
//------------------------------------------------------------------------- //-------------------------------------------------------------------------
void vtkProp3DButtonRepresentation::PlaceWidget(double bds[6]) void vtkProp3DButtonRepresentation::PlaceWidget(double bds[6])
{ {
int i;
double bounds[6], center[3], aBds[6], aCenter[3]; double bounds[6], center[3], aBds[6], aCenter[3];
this->AdjustBounds(bds, bounds, center); this->AdjustBounds(bds, bounds, center);
for (i=0; i<6; i++) for (int i=0; i<6; i++)
{ {
this->InitialBounds[i] = bounds[i]; this->InitialBounds[i] = bounds[i];
} }
......
...@@ -206,11 +206,10 @@ PlaceWidget(double scale, double xyz[3], double normal[3]) ...@@ -206,11 +206,10 @@ PlaceWidget(double scale, double xyz[3], double normal[3])
//------------------------------------------------------------------------- //-------------------------------------------------------------------------
void vtkTexturedButtonRepresentation::PlaceWidget(double bds[6]) void vtkTexturedButtonRepresentation::PlaceWidget(double bds[6])
{ {
int i;
double bounds[6], center[3], aBds[6], aCenter[3]; double bounds[6], center[3], aBds[6], aCenter[3];
this->AdjustBounds(bds, bounds, center); this->AdjustBounds(bds, bounds, center);
for (i=0; i<6; i++) for (int i=0; i<6; i++)
{ {
this->InitialBounds[i] = bounds[i]; this->InitialBounds[i] = bounds[i];
} }
......
Supports Markdown
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