Commit 5b96e3c9 authored by Jason Shepherd's avatar Jason Shepherd
Browse files

squashing more compiler warnings

parent afd3ee7f
......@@ -4475,7 +4475,7 @@ int DisplaySurfaceSkeleton(vtkPolyData *surfaceMesh, vtkTable *skeleton)
return 0;
}
int DisplayVolumeSkeleton(vtkUnstructuredGrid *volumeMesh, vtkTable *skeleton)
int DisplayVolumeSkeleton(vtkUnstructuredGrid* vtkNotUsed(volumeMesh), vtkTable *skeleton)
{
// no rendering of the mesh this time, just the skeleton.
// one could just display the bounding surface of the volume (if the volume is
......@@ -4596,7 +4596,7 @@ int DisplayVolumeSkeleton(vtkUnstructuredGrid *volumeMesh, vtkTable *skeleton)
return 0;
}
int TestReebGraph( int argc, char* argv[] )
int TestReebGraph(int vtkNotUsed(argc), char* vtkNotUsed(argv)[] )
{
int errorCode;
......
......@@ -86,9 +86,7 @@ vtkTable* vtkAreaContourSpectrumFilter::GetOutput()
}
//----------------------------------------------------------------------------
int vtkAreaContourSpectrumFilter::RequestData(
vtkInformation *request, vtkInformationVector **inputVector,
vtkInformationVector *outputVector)
int vtkAreaContourSpectrumFilter::RequestData(vtkInformation* vtkNotUsed(request), vtkInformationVector **inputVector, vtkInformationVector *outputVector)
{
vtkInformation *inInfoMesh = inputVector[0]->GetInformationObject(0),
......@@ -189,13 +187,13 @@ int vtkAreaContourSpectrumFilter::RequestData(
vertexIds[i + 1] = vertexList->GetVariantValue(i).ToInt();
// mark all the input triangles as non visited.
for(int i = 0; i < visitedTriangles.size(); i++)
for(unsigned int i = 0; i < visitedTriangles.size(); i++)
visitedTriangles[i] = false;
// now do the parsing
double min = scalarField->GetComponent(vertexIds[0], 0),
max = scalarField->GetComponent(vertexIds[vertexIds.size()-1], 0);
for(int i = 0; i < vertexIds.size(); i++)
for(unsigned int i = 0; i < vertexIds.size(); i++)
{
scalarValues[i] = scalarField->GetComponent(vertexIds[i], 0);
......@@ -237,7 +235,7 @@ int vtkAreaContourSpectrumFilter::RequestData(
// now adjust to the desired sampling
std::vector<std::pair<int, double> > samples(NumberOfSamples);
int pos = 0;
unsigned int pos = 0;
for(int i = 0; i < NumberOfSamples; i++)
{
samples[i].first = 0;
......@@ -295,7 +293,7 @@ int vtkAreaContourSpectrumFilter::RequestData(
// now prepare the output
vtkVariantArray *outputSignature = vtkVariantArray::New();
outputSignature->SetNumberOfTuples(samples.size());
for(int i = 0; i < samples.size(); i++)
for(unsigned int i = 0; i < samples.size(); i++)
{
outputSignature->SetValue(i, samples[i].second);
}
......
......@@ -87,9 +87,7 @@ vtkTable* vtkReebGraphSurfaceSkeletonFilter::GetOutput()
}
//----------------------------------------------------------------------------
int vtkReebGraphSurfaceSkeletonFilter::RequestData(
vtkInformation *request, vtkInformationVector **inputVector,
vtkInformationVector *outputVector)
int vtkReebGraphSurfaceSkeletonFilter::RequestData(vtkInformation* vtkNotUsed(request), vtkInformationVector **inputVector, vtkInformationVector *outputVector)
{
vtkInformation *inInfoMesh = inputVector[0]->GetInformationObject(0),
......@@ -167,11 +165,11 @@ int vtkReebGraphSurfaceSkeletonFilter::RequestData(
std::vector<bool> visitedTriangles(inputMesh->GetNumberOfCells());
for(int i = 0; i < visitedTriangles.size(); i++)
for(unsigned int i = 0; i < visitedTriangles.size(); i++)
visitedTriangles[i] = false;
std::vector<bool> visitedVertices(inputMesh->GetNumberOfPoints());
for(int i = 0; i < visitedVertices.size(); i++)
for(unsigned int i = 0; i < visitedVertices.size(); i++)
visitedVertices[i] = false;
// add the vertices to the subMesh
......@@ -332,7 +330,7 @@ int vtkReebGraphSurfaceSkeletonFilter::RequestData(
smoothedArc.push_back(arcSkeleton[0]);
if(arcSkeleton.size() > 2)
{
for(int j = 1; j < arcSkeleton.size() - 1; j++)
for(unsigned int j = 1; j < arcSkeleton.size() - 1; j++)
{
std::vector<double> smoothedSample(3);
for(int k = 0; k < 3; k++)
......@@ -346,7 +344,7 @@ int vtkReebGraphSurfaceSkeletonFilter::RequestData(
smoothedArc.push_back(arcSkeleton[arcSkeleton.size() - 1]);
// now, replace arcSkeleton with smoohtedArc for the next Iteration
for(int j = 0; j < arcSkeleton.size(); j++)
for(unsigned int j = 0; j < arcSkeleton.size(); j++)
arcSkeleton[j] = smoothedArc[j];
}
......@@ -363,11 +361,11 @@ int vtkReebGraphSurfaceSkeletonFilter::RequestData(
// now prepare the output
output->Initialize();
for(int i = 0; i < skeleton.size(); i++)
for(unsigned int i = 0; i < skeleton.size(); i++)
{
vtkDoubleArray *outputArc = vtkDoubleArray::New();
outputArc->SetNumberOfComponents(3);
for(int j = 0; j < skeleton[i].size(); j++)
for(unsigned int j = 0; j < skeleton[i].size(); j++)
{
double *point = (double *) malloc(sizeof(double)*3);
for(int k = 0; k < 3; k++)
......
......@@ -130,13 +130,12 @@ int vtkReebGraphToJoinSplitTreeFilter::RequestData(vtkInformation* vtkNotUsed(re
return 0;
// first, uncompress the input Reeb graph.
vtkMutableDirectedGraph *unCompressedGraph =
vtkMutableDirectedGraph::New();
vtkMutableDirectedGraph *unCompressedGraph = vtkMutableDirectedGraph::New();
std::vector<std::pair<int, double> > vertexList;
for(int i = 0; i < vertexInfo->GetNumberOfTuples(); i++)
{
int vertexId = (int) *(vertexInfo->GetTuple(i));
double scalarValue = scalarField->GetComponent(vertexId, 0);
int vertexId = (int) *(vertexInfo->GetTuple(i));
double scalarValue = scalarField->GetComponent(vertexId, 0);
vertexList.push_back(std::pair<int, double>(vertexId, scalarValue));
}
......@@ -317,8 +316,7 @@ int vtkReebGraphToJoinSplitTreeFilter::RequestData(vtkInformation* vtkNotUsed(re
if(representatives.size() == 1)
{
// add a deg2 node
edgeList[representative].second.push_back(
vertexList[i].first);
edgeList[representative].second.push_back(vertexList[i].first);
// propagate the vertexId to be used to query the UF.
vertexToUFQueryMap[vertexList[i].first] =
vertexToUFQueryMap[halfStars[vertexList[i].first][
......
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