Commit ad324d8b authored by Sean McBride's avatar Sean McBride Committed by Kitware Robot

Merge topic 'Wcomma'

8162e61c Fixed most clang -Wcomma warnings
Acked-by: Kitware Robot's avatarKitware Robot <kwrobot@kitware.com>
Merge-request: !1296
parents 5239aad8 8162e61c
Pipeline #8693 running with stage
......@@ -833,11 +833,10 @@ int vtkKdNode::IntersectsCell(vtkCell *cell, int useDataBounds, int cellRegion,
min = this->Min;
max = this->Max;
}
double regionBounds[6];
regionBounds[0] = min[0], regionBounds[1] = max[0];
regionBounds[2] = min[1], regionBounds[3] = max[1];
regionBounds[4] = min[2], regionBounds[5] = max[2];
double regionBounds[6] = {
min[0], max[0],
min[1], max[1],
min[2], max[2]};
if (cell->GetCellType() == VTK_TRIANGLE_STRIP)
{
......
......@@ -2215,7 +2215,8 @@ int vtkPolyData::GetScalarFieldCriticalIndex (vtkIdType pointId,
triangleList->Delete();
visitedPointNb++;
currentPointId = stack->GetId(stackBottom), nextPointId = -1;
currentPointId = stack->GetId(stackBottom);
nextPointId = -1;
}while(stackBottom < stack->GetNumberOfIds());
......@@ -2238,7 +2239,8 @@ int vtkPolyData::GetScalarFieldCriticalIndex (vtkIdType pointId,
stack->Delete();
stack = vtkIdList::New();
stack->InsertUniqueId(upperLinkPointList->GetId(0));
currentPointId = stack->GetId(stackBottom), nextPointId = -1;
currentPointId = stack->GetId(stackBottom);
nextPointId = -1;
do
{
stackBottom++;
......@@ -2273,7 +2275,8 @@ int vtkPolyData::GetScalarFieldCriticalIndex (vtkIdType pointId,
triangleList->Delete();
visitedPointNb++;
currentPointId = stack->GetId(stackBottom), nextPointId = -1;
currentPointId = stack->GetId(stackBottom);
nextPointId = -1;
}while(stackBottom < stack->GetNumberOfIds());
if(visitedPointNb != upperLinkPointNb)
......
......@@ -864,8 +864,7 @@ void vtkTemporalFractal::Traverse(int &blockId,
}
// Get the bounds of the proposed block.
int ext[6];
ext[0]=x0; ext[1]=x3; ext[2]=y0; ext[3]=y3, ext[4]=z0; ext[5]=z3;
int ext[6] = {x0, x3, y0, y3, z0, z3};
this->CellExtentToBounds(level, ext, bds);
x0 = x0*2;
......
......@@ -931,7 +931,7 @@ int vtkParallelopipedRepresentation
// will determine which axis of the parallelopiped we will rescale along
axis[i][0] = neighborDisplayPos[i][0] - handleDisplayPos[0];
axis[i][1] = neighborDisplayPos[i][1] - handleDisplayPos[1],
axis[i][1] = neighborDisplayPos[i][1] - handleDisplayPos[1];
axis[i][2] = 0.0;
vtkMath::Normalize2D(axis[i]);
......
......@@ -1471,7 +1471,8 @@ void vtkXYPlotActor::ComputeXRange( double range[2], double *lengths )
double maxLength=0.0, xPrev[3], x[3];
vtkDataSet *ds;
range[0] = VTK_DOUBLE_MAX, range[1] = VTK_DOUBLE_MIN;
range[0] = VTK_DOUBLE_MAX;
range[1] = VTK_DOUBLE_MIN;
int numDS = this->InputConnectionHolder->GetNumberOfInputConnections( 0 );
for ( dsNum=0, maxNum=0; dsNum<numDS; dsNum++)
......@@ -1587,7 +1588,8 @@ void vtkXYPlotActor::ComputeYRange( double range[2] )
double sRange[2];
int component;
range[0]=VTK_DOUBLE_MAX, range[1]=VTK_DOUBLE_MIN;
range[0] = VTK_DOUBLE_MAX;
range[1] = VTK_DOUBLE_MIN;
int numDS = this->InputConnectionHolder->GetNumberOfInputConnections( 0 );
for ( int dsNum=0, count = 0; dsNum<numDS; dsNum++, count++)
......
......@@ -1139,7 +1139,7 @@ void vtkImageResliceMapper::CheckerboardImage(
input->GetOrigin(origin);
checkOffset[0] = (checkOffset[0] - origin[0])/spacing[0];
checkOffset[1] = (checkOffset[1] - origin[1])/spacing[1];
checkSpacing[0] /= spacing[0],
checkSpacing[0] /= spacing[0];
checkSpacing[1] /= spacing[1];
// Apply the checkerboard to the data
......
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