Commit f478aac4 authored by hkrishna's avatar hkrishna

warning fixes for plots directory

git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@23664 18c085ea-50e0-402c-830e-de6fd14e8384
parent 5eb5ebd6
......@@ -556,7 +556,7 @@ BoundaryAttributes_SetMultiColor(PyObject *self, PyObject *args)
{
PyObject *item = PyTuple_GET_ITEM(pyobj, i);
if(PyTuple_Check(item) &&
PyTuple_Size(item) == 3 || PyTuple_Size(item) == 4)
(PyTuple_Size(item) == 3 || PyTuple_Size(item) == 4))
{
C[i*4] = 0;
C[i*4+1] = 0;
......@@ -600,7 +600,7 @@ BoundaryAttributes_SetMultiColor(PyObject *self, PyObject *args)
{
PyObject *item = PyList_GET_ITEM(pyobj, i);
if(PyTuple_Check(item) &&
PyTuple_Size(item) == 3 || PyTuple_Size(item) == 4)
(PyTuple_Size(item) == 3 || PyTuple_Size(item) == 4))
{
C[i*4] = 0;
C[i*4+1] = 0;
......@@ -1364,7 +1364,7 @@ PyBoundaryAttributes_GetLogString()
static void
PyBoundaryAttributes_CallLogRoutine(Subject *subj, void *data)
{
BoundaryAttributes *atts = (BoundaryAttributes *)subj;
BoundaryAttributes *atts = (BoundaryAttributes *)subj; (void)atts;
typedef void (*logCallback)(const std::string &);
logCallback cb = (logCallback)data;
......
......@@ -560,7 +560,7 @@ QvisBoundaryPlotWindow::UpdateMultipleArea()
const stringVector &matNames = boundaryAtts->GetBoundaryNames();
intVector selectedBoundaries;
bool update = true;
int i;
size_t i;
QListWidgetItem *item;
multipleColorList->blockSignals(true);
......@@ -568,7 +568,7 @@ QvisBoundaryPlotWindow::UpdateMultipleArea()
//
// Make a pass through the widget to see how many boundaries are selected.
//
for(i = 0; i < multipleColorList->count(); ++i)
for(i = 0; i < (size_t)multipleColorList->count(); ++i)
{
if(multipleColorList->item(i)->isSelected())
selectedBoundaries.push_back(i);
......@@ -577,7 +577,7 @@ QvisBoundaryPlotWindow::UpdateMultipleArea()
//
// Modify the names.
//
if(matNames.size() == multipleColorList->count())
if(matNames.size() == (size_t)multipleColorList->count())
{
// See if the strings are the same..
bool same = true;
......@@ -598,10 +598,10 @@ QvisBoundaryPlotWindow::UpdateMultipleArea()
else
update = false;
}
else if(matNames.size() > multipleColorList->count())
else if(matNames.size() > (size_t)multipleColorList->count())
{
// Set all of the existing names.
for(i = 0; i < multipleColorList->count(); ++i)
for(i = 0; i < (size_t)multipleColorList->count(); ++i)
UpdateItem(i);
// Add new entries
......@@ -620,7 +620,7 @@ QvisBoundaryPlotWindow::UpdateMultipleArea()
UpdateItem(i);
// Remove excess entries
int numEntries = multipleColorList->count();
size_t numEntries = multipleColorList->count();
for(i = matNames.size(); i < numEntries; ++i)
{
QListWidgetItem *item = multipleColorList->takeItem(multipleColorList->count() - 1);
......@@ -669,7 +669,7 @@ QvisBoundaryPlotWindow::UpdateMultipleArea()
//
if(matNames.size() > 0)
{
int selectedIndex = (selectedBoundaries.size() > 0) ?
size_t selectedIndex = (selectedBoundaries.size() > 0) ?
selectedBoundaries[0] : 0;
// Make sure that the selected index is in the range of visible colors.
if(selectedIndex >= matNames.size())
......
......@@ -385,7 +385,7 @@ avtBoundaryFilter::ModifyContract(avtContract_p spec)
spec->GetDataRequest()->AddSecondaryVariable(pointVar.c_str());
}
avtDataAttributes &data = GetInput()->GetInfo().GetAttributes();
//avtDataAttributes &data = GetInput()->GetInfo().GetAttributes();
if (spec->GetDataRequest()->MayRequireZones() ||
spec->GetDataRequest()->MayRequireNodes())
{
......
......@@ -816,7 +816,7 @@ avtBoundaryPlot::ReleaseData(void)
void
avtBoundaryPlot::SortLabels()
{
int i;
size_t i;
vector < string > originalLabels = atts.GetBoundaryNames();
......@@ -833,7 +833,7 @@ avtBoundaryPlot::SortLabels()
vector < string > usedLabels;
behavior->GetInfo().GetAttributes().GetLabels(usedLabels);
sort(usedLabels.begin(), usedLabels.end());
int origLabelIndex = 0;
size_t origLabelIndex = 0;
vector < pair < int, string > > sortedUsedLabels;
for (i = 0 ; i < usedLabels.size() ; i++)
{
......
......@@ -650,7 +650,7 @@ ContourAttributes_SetMultiColor(PyObject *self, PyObject *args)
{
PyObject *item = PyTuple_GET_ITEM(pyobj, i);
if(PyTuple_Check(item) &&
PyTuple_Size(item) == 3 || PyTuple_Size(item) == 4)
(PyTuple_Size(item) == 3 || PyTuple_Size(item) == 4))
{
C[i*4] = 0;
C[i*4+1] = 0;
......@@ -694,7 +694,7 @@ ContourAttributes_SetMultiColor(PyObject *self, PyObject *args)
{
PyObject *item = PyList_GET_ITEM(pyobj, i);
if(PyTuple_Check(item) &&
PyTuple_Size(item) == 3 || PyTuple_Size(item) == 4)
(PyTuple_Size(item) == 3 || PyTuple_Size(item) == 4))
{
C[i*4] = 0;
C[i*4+1] = 0;
......@@ -1502,7 +1502,7 @@ PyContourAttributes_GetLogString()
static void
PyContourAttributes_CallLogRoutine(Subject *subj, void *data)
{
ContourAttributes *atts = (ContourAttributes *)subj;
ContourAttributes *atts = (ContourAttributes *)subj; (void)atts;
typedef void (*logCallback)(const std::string &);
logCallback cb = (logCallback)data;
......
......@@ -822,7 +822,7 @@ void
QvisContourPlotWindow::UpdateSelectByText()
{
QString temp, temp2;
int i;
size_t i;
if(contourAtts->GetContourMethod() == ContourAttributes::Level)
{
......
......@@ -1781,7 +1781,7 @@ PyCurveAttributes_GetLogString()
static void
PyCurveAttributes_CallLogRoutine(Subject *subj, void *data)
{
CurveAttributes *atts = (CurveAttributes *)subj;
CurveAttributes *atts = (CurveAttributes *)subj; (void)atts;
typedef void (*logCallback)(const std::string &);
logCallback cb = (logCallback)data;
......
......@@ -665,7 +665,7 @@ avtOpenGLCurveRenderer::DrawCurveAsSymbols()
#define MAX_SYMBOL_VERTS 25
double symbolPoints[MAX_SYMBOL_VERTS][2];
int symbolNVerts;
int symbolNVerts = 0; ///TODO: check fix for uninitialized warning
if (atts.GetSymbol() == CurveAttributes::Point)
{
symbolNVerts = 1;
......
......@@ -570,7 +570,7 @@ FilledBoundaryAttributes_SetMultiColor(PyObject *self, PyObject *args)
{
PyObject *item = PyTuple_GET_ITEM(pyobj, i);
if(PyTuple_Check(item) &&
PyTuple_Size(item) == 3 || PyTuple_Size(item) == 4)
(PyTuple_Size(item) == 3 || PyTuple_Size(item) == 4))
{
C[i*4] = 0;
C[i*4+1] = 0;
......@@ -614,7 +614,7 @@ FilledBoundaryAttributes_SetMultiColor(PyObject *self, PyObject *args)
{
PyObject *item = PyList_GET_ITEM(pyobj, i);
if(PyTuple_Check(item) &&
PyTuple_Size(item) == 3 || PyTuple_Size(item) == 4)
(PyTuple_Size(item) == 3 || PyTuple_Size(item) == 4))
{
C[i*4] = 0;
C[i*4+1] = 0;
......@@ -1521,7 +1521,7 @@ PyFilledBoundaryAttributes_GetLogString()
static void
PyFilledBoundaryAttributes_CallLogRoutine(Subject *subj, void *data)
{
FilledBoundaryAttributes *atts = (FilledBoundaryAttributes *)subj;
FilledBoundaryAttributes *atts = (FilledBoundaryAttributes *)subj; (void)atts;
typedef void (*logCallback)(const std::string &);
logCallback cb = (logCallback)data;
......
......@@ -604,7 +604,7 @@ QvisFilledBoundaryPlotWindow::UpdateMultipleArea()
const stringVector &matNames = boundaryAtts->GetBoundaryNames();
intVector selectedBoundaries;
bool update = true;
int i;
size_t i;
QListWidgetItem *item;
multipleColorList->blockSignals(true);
......@@ -612,7 +612,7 @@ QvisFilledBoundaryPlotWindow::UpdateMultipleArea()
//
// Make a pass through the widget to see how many boundaries are selected.
//
for(i = 0; i < multipleColorList->count(); ++i)
for(i = 0; i < (size_t)multipleColorList->count(); ++i)
{
if(multipleColorList->item(i)->isSelected())
selectedBoundaries.push_back(i);
......@@ -621,7 +621,7 @@ QvisFilledBoundaryPlotWindow::UpdateMultipleArea()
//
// Modify the names.
//
if(matNames.size() == multipleColorList->count())
if(matNames.size() == (size_t)multipleColorList->count())
{
// See if the strings are the same..
bool same = true;
......@@ -642,10 +642,10 @@ QvisFilledBoundaryPlotWindow::UpdateMultipleArea()
else
update = false;
}
else if(matNames.size() > multipleColorList->count())
else if(matNames.size() > (size_t)multipleColorList->count())
{
// Set all of the existing names.
for(i = 0; i < multipleColorList->count(); ++i)
for(i = 0; i < (size_t)multipleColorList->count(); ++i)
UpdateItem(i);
// Add new entries
......@@ -665,7 +665,7 @@ QvisFilledBoundaryPlotWindow::UpdateMultipleArea()
// Remove excess entries
int numEntries = multipleColorList->count();
for(i = (int)matNames.size(); i < numEntries; ++i)
for(i = (int)matNames.size(); i < (size_t)numEntries; ++i)
{
QListWidgetItem *item = multipleColorList->takeItem(multipleColorList->count() - 1);
if(item != 0)
......@@ -716,7 +716,7 @@ QvisFilledBoundaryPlotWindow::UpdateMultipleArea()
int selectedIndex = (selectedBoundaries.size() > 0) ?
selectedBoundaries[0] : 0;
// Make sure that the selected index is in the range of visible colors.
if(selectedIndex >= matNames.size())
if((size_t)selectedIndex >= matNames.size())
selectedIndex = 0;
SetMultipleColorWidgets(selectedIndex);
......
......@@ -412,7 +412,7 @@ avtFilledBoundaryFilter::ModifyContract(avtContract_p spec)
spec->SetCalculateVariableExtents(pointVar, true);
}
avtDataAttributes &data = GetInput()->GetInfo().GetAttributes();
//avtDataAttributes &data = GetInput()->GetInfo().GetAttributes();
if (spec->GetDataRequest()->MayRequireZones() ||
spec->GetDataRequest()->MayRequireNodes())
{
......
......@@ -267,7 +267,7 @@ avtFilledBoundaryPlot::SetAtts(const AttributeGroup *a)
{
levelsMapper->DataScalingOff();
}
avtPointGlypher::PointGlyphType glyphType = avtPointGlypher::Point;
//avtPointGlypher::PointGlyphType glyphType = avtPointGlypher::Point;
if (atts.GetPointType() == FilledBoundaryAttributes::Box)
levelsMapper->SetGlyphType(avtPointGlypher::Box);
else if (atts.GetPointType() == FilledBoundaryAttributes::Axis)
......@@ -949,7 +949,7 @@ avtFilledBoundaryPlot::ReleaseData(void)
void
avtFilledBoundaryPlot::SortLabels()
{
int i;
size_t i;
vector < string > originalLabels = atts.GetBoundaryNames();
......@@ -966,7 +966,7 @@ avtFilledBoundaryPlot::SortLabels()
vector < string > usedLabels;
behavior->GetInfo().GetAttributes().GetLabels(usedLabels);
sort(usedLabels.begin(), usedLabels.end());
int origLabelIndex = 0;
size_t origLabelIndex = 0;
vector < pair < int, string > > sortedUsedLabels;
for (i = 0 ; i < usedLabels.size() ; i++)
{
......
......@@ -1203,7 +1203,7 @@ PyHistogramAttributes_GetLogString()
static void
PyHistogramAttributes_CallLogRoutine(Subject *subj, void *data)
{
HistogramAttributes *atts = (HistogramAttributes *)subj;
HistogramAttributes *atts = (HistogramAttributes *)subj; (void)atts;
typedef void (*logCallback)(const std::string &);
logCallback cb = (logCallback)data;
......
......@@ -142,7 +142,7 @@ QvisHistogramPlotWindow::CreateWindowContents()
{
// Figure out the max width that we want to allow for some simple
// line edit widgets.
int maxWidth = fontMetrics().width("1.0000000000");
//int maxWidth = fontMetrics().width("1.0000000000");
QGridLayout *mainLayout = new QGridLayout();
topLayout->addLayout(mainLayout);
......
......@@ -283,7 +283,7 @@ avtHistogramFilter::PostExecute(void)
{
ranges =
GetInput()->GetInfo().GetAttributes().GetVariableBinRanges();
if (ranges.size() == workingNumBins+1)
if (ranges.size() == (size_t)workingNumBins+1)
spaceBins = true;
}
......@@ -1030,7 +1030,7 @@ avtHistogramFilter::ArrayVarExecute(vtkDataSet *inDS, int chunk)
int ncells = inDS->GetNumberOfCells();
for (int i = 0 ; i < ncells ; i++)
{
if (ptr[ncomps*i + compOffset] == zone)
if (ptr[ncomps*i + compOffset] == (size_t)zone)
{
workingNumBins = arr->GetNumberOfComponents();
double *vals = new double[workingNumBins];
......
......@@ -71,8 +71,8 @@
// Look for the original cell number array.
//
vtkUnsignedIntArray *originalCells = 0;
vtkDataArray *subsetLabel = 0;
vtkDataArray *materialLabels = 0;
//vtkDataArray *subsetLabel = 0;
//vtkDataArray *materialLabels = 0;
vtkDataArray *data = input->GetCellData()->GetArray("LabelFilterOriginalCellNumbers");
if(data == 0 && atts.GetVarType() == LabelAttributes::LABEL_VT_VECTOR_VAR)
{
......@@ -271,7 +271,7 @@
BEGIN_LABEL
labelString[0] = '\0';
double *vals = data->GetTuple(id);
bool atStart = true;
//bool atStart = true;
for (int comp = 0 ; comp < nComps ; comp++)
{
char *formatString = NULL;
......
......@@ -256,7 +256,7 @@ debug3 << "Labelling nodes with 3d tensor data" << endl;
BEGIN_LABEL
labelString[0] = '\0';
double *vals = data->GetTuple(id);
bool atStart = true;
//bool atStart = true;
for (int comp = 0 ; comp < nComps ; comp++)
{
char *formatString = NULL;
......@@ -331,7 +331,7 @@ debug3 << "Labelling nodes with original node indices: "
// const float *vert = p->GetPoint(id);
BEGIN_LABEL
unsigned int realNodeId = originalNodes->GetValue(id);
if(realNodeId == -1)
if(realNodeId == (unsigned int)-1) ///TODO: check fix that converts -1 to max
{
CREATE_LABEL(labelString, MAX_LABEL_SIZE, " ");
}
......@@ -353,7 +353,7 @@ debug3 << "Labelling nodes with original node indices: "
// const float *vert = p->GetPoint(id);
BEGIN_LABEL
unsigned int realNodeId = originalNodes->GetValue(id);
if(realNodeId == -1)
if(realNodeId == (unsigned int)-1) ///TODO: check on fix asunsigned int cannot become -1 converting to max
{
CREATE_LABEL(labelString, MAX_LABEL_SIZE, " ");
}
......@@ -381,7 +381,7 @@ debug3 << "Labelling nodes with original node indices: "
// const float *vert = p->GetPoint(id);
BEGIN_LABEL
unsigned int realNodeId = originalNodes->GetValue(id);
if(realNodeId == -1)
if(realNodeId == (unsigned int)-1) ///TODO: check fix that converts -1 to max
{
CREATE_LABEL(labelString, MAX_LABEL_SIZE, " ");
}
......
......@@ -1131,7 +1131,7 @@ PyLabelAttributes_GetLogString()
static void
PyLabelAttributes_CallLogRoutine(Subject *subj, void *data)
{
LabelAttributes *atts = (LabelAttributes *)subj;
LabelAttributes *atts = (LabelAttributes *)subj; (void)atts;
typedef void (*logCallback)(const std::string &);
logCallback cb = (logCallback)data;
......
......@@ -443,8 +443,9 @@ avtLabelPlot::CustomizeBehavior(void)
debug4 << "avtLabelPlot::CustomizeBehavior: Labels = " << endl;
std::vector<std::string> labels;
behavior->GetInfo().GetAttributes().GetLabels(labels);
for(int i = 0; i < labels.size(); ++i)
for(size_t i = 0; i < labels.size(); ++i) {
debug4 << "\tlabel["<<i<<"] = " << labels[i].c_str() << endl;
}
debug4 << endl;
}
......
......@@ -203,7 +203,7 @@ avtLabelsMapper::CustomizeMappers(void)
vtkUserDefinedMapperBridge2 *M =
(vtkUserDefinedMapperBridge2 *)mappers[i];
if(i < labelNames.size())
if((size_t)i < labelNames.size())
M->SetLabel(labelNames[i]);
M->SetRendererAction(RENDERER_ACTION_NOTHING);
}
......
......@@ -2075,12 +2075,15 @@ avtOpenGLLabelRenderer::InitializeZBuffer(bool haveNodeData,
zTolerance = float(zShift * 1.001);
}
if(zBufferMode == ZBUFFER_DONT_USE)
if(zBufferMode == ZBUFFER_DONT_USE) {
debug4 << mName << "zBufferMode = ZBUFFER_DONT_USE" << endl;
else if(zBufferMode == ZBUFFER_USE_PROVIDED)
}
else if(zBufferMode == ZBUFFER_USE_PROVIDED) {
debug4 << mName << "zBufferMode = ZBUFFER_USE_PROVIDED" << endl;
else if(zBufferMode == ZBUFFER_QUERY)
}
else if(zBufferMode == ZBUFFER_QUERY) {
debug4 << mName << "zBufferMode = ZBUFFER_QUERY" << endl;
}
}
// ****************************************************************************
......
......@@ -1246,7 +1246,7 @@ PyMeshAttributes_GetLogString()
static void
PyMeshAttributes_CallLogRoutine(Subject *subj, void *data)
{
MeshAttributes *atts = (MeshAttributes *)subj;
MeshAttributes *atts = (MeshAttributes *)subj; (void)atts;
typedef void (*logCallback)(const std::string &);
logCallback cb = (logCallback)data;
......
......@@ -499,7 +499,7 @@ avtMeshFilter::ModifyContract(avtContract_p spec)
rv->SetCalculateVariableExtents(pointVar, true);
}
avtDataAttributes &data = GetInput()->GetInfo().GetAttributes();
//avtDataAttributes &data = GetInput()->GetInfo().GetAttributes();
if (spec->GetDataRequest()->MayRequireZones() ||
spec->GetDataRequest()->MayRequireNodes())
{
......
......@@ -1235,7 +1235,7 @@ avtMeshPlot::SetOpaqueMeshIsAppropriate(bool val)
bool
avtMeshPlot::ShouldRenderOpaque(void)
{
bool shouldBeOn;
bool shouldBeOn = false; ///TODO: check on fix for uninitialized value
switch (atts.GetOpaqueMode())
{
......
......@@ -1291,7 +1291,7 @@ PyMoleculeAttributes_GetLogString()
static void
PyMoleculeAttributes_CallLogRoutine(Subject *subj, void *data)
{
MoleculeAttributes *atts = (MoleculeAttributes *)subj;
MoleculeAttributes *atts = (MoleculeAttributes *)subj; (void)atts;
typedef void (*logCallback)(const std::string &);
logCallback cb = (logCallback)data;
......
......@@ -336,13 +336,13 @@ avtMoleculeFilter::PostExecute()
// the known residue names into the labels. We send them all
// with an on/off flag so we can let the viewer know about
// new residues that we've learned about.
bool err = false;
//bool err = false;
for(int i = 0; i < NumberOfKnownResidues(); ++i)
{
const char *rn = NumberToResiduename(i);
if(rn == 0)
{
err = true;
//err = true;
break;
}
......
......@@ -562,7 +562,7 @@ avtMoleculePlot::EnhanceSpecification(avtContract_p spec)
avtDataRequest_p nds = new avtDataRequest(primaryVariable,
ds->GetTimestep(),
ds->GetRestriction());
for (int i=0; i<added_vars.size(); i++)
for (size_t i=0; i<added_vars.size(); i++)
{
nds->AddSecondaryVariable(added_vars[i].c_str());
}
......
......@@ -248,7 +248,8 @@ void
avtMoleculeRenderer::Initialize(vtkDataSet *ds)
{
// get data set
vtkPolyData *polydata = (vtkPolyData*)ds;
//vtkPolyData *polydata = (vtkPolyData*)ds;
(void) ds;
initialized = true;
}
......@@ -271,7 +272,7 @@ avtMoleculeRenderer::Initialize(vtkDataSet *ds)
void
avtMoleculeRenderer::SetAtts(const AttributeGroup *a)
{
const MoleculeAttributes *newAtts = (const MoleculeAttributes*)a;
//const MoleculeAttributes *newAtts = (const MoleculeAttributes*)a;
atts = *(const MoleculeAttributes*)a;
initialized = false;
......@@ -358,9 +359,9 @@ avtMoleculeRenderer::SetSpecularProperties(bool flag, double coeff,
spec_coeff = flag ? coeff : 0;
spec_power = power;
int r = color.Red();
int g = color.Green();
int b = color.Blue();
//int r = color.Red();
//int g = color.Green();
//int b = color.Blue();
spec_r = float(color.Red())/255.;
spec_g = float(color.Green())/255.;
spec_b = float(color.Blue())/255.;
......
......@@ -248,12 +248,12 @@ avtOpenGLAtomTexturer2D::MakeTextures()
{
int i, j;
float dx = SPHERE_TEX_H * 0.5f;
float dy = SPHERE_TEX_H * 0.5f;
float R = dx-2;
//float dx = SPHERE_TEX_H * 0.5f;
//float dy = SPHERE_TEX_H * 0.5f;
//float R = dx-2;
float minT = 0.;
float maxT = 0.;
//float minT = 0.;
//float maxT = 0.;
GLubyte texture[SPHERE_TEX_H][SPHERE_TEX_H][2];
......@@ -266,8 +266,8 @@ avtOpenGLAtomTexturer2D::MakeTextures()
float x2y2 = sqrt(x*x + y*y);
if(x2y2 < 1.)
{
float z = sqrt(1. - x2y2);
GLubyte rc = (GLubyte)(z * 255.);
//float z = sqrt(1. - x2y2);
//GLubyte rc = (GLubyte)(z * 255.);
texture[j][i][0] = (GLubyte) 0;
texture[j][i][1] = (GLubyte) 255;
......
......@@ -287,12 +287,12 @@ TextureModeData::MakeTextures()
{
int i, j;
float dx = SPHERE_TEX_H * 0.5f;
float dy = SPHERE_TEX_H * 0.5f;
float R = dx-2;
//float dx = SPHERE_TEX_H * 0.5f;
//float dy = SPHERE_TEX_H * 0.5f;
//float R = dx-2;
float minT = 0.;
float maxT = 0.;
//float minT = 0.;
//float maxT = 0.;
GLubyte texture[SPHERE_TEX_H][SPHERE_TEX_H][2];
......
......@@ -450,7 +450,7 @@ MultiCurveAttributes_SetMultiColor(PyObject *self, PyObject *args)
{
PyObject *item = PyTuple_GET_ITEM(pyobj, i);
if(PyTuple_Check(item) &&
PyTuple_Size(item) == 3 || PyTuple_Size(item) == 4)
(PyTuple_Size(item) == 3 || PyTuple_Size(item) == 4))
{
C[i*4] = 0;
C[i*4+1] = 0;
......@@ -494,7 +494,7 @@ MultiCurveAttributes_SetMultiColor(PyObject *self, PyObject *args)
{
PyObject *item = PyList_GET_ITEM(pyobj, i);
if(PyTuple_Check(item) &&
PyTuple_Size(item) == 3 || PyTuple_Size(item) == 4)
(PyTuple_Size(item) == 3 || PyTuple_Size(item) == 4))
{
C[i*4] = 0;
C[i*4+1] = 0;
......@@ -1231,7 +1231,7 @@ PyMultiCurveAttributes_GetLogString()
static void
PyMultiCurveAttributes_CallLogRoutine(Subject *subj, void *data)
{
MultiCurveAttributes *atts = (MultiCurveAttributes *)subj;
MultiCurveAttributes *atts = (MultiCurveAttributes *)subj; (void)atts;
typedef void (*logCallback)(const std::string &);
logCallback cb = (logCallback)data;
......
......@@ -515,7 +515,7 @@ avtMultiCurveFilter::Execute(void)
//
// Create the label.
//
if(inLabels.size() != ny)
if(inLabels.size() != (size_t)ny)
{
char label[80];
......
......@@ -217,9 +217,9 @@ avtMultiCurveLabelMapper::SetDatasetInput(vtkDataSet *ds, int inNum)
if (buf2[i] != INT_MIN)
sprintf(label, "%d", buf2[i]);
else
sprintf(label, "");
strcpy(label, "");
else
sprintf(label, "%d", i);
sprintf(label, "%lld", i);
la->SetDesignator(label);
la->SetScaleFactor(scale);
la->SetForegroundColor(col[0], col[1], col[2], col[3]);
......@@ -252,7 +252,7 @@ void
avtMultiCurveLabelMapper::SetScale(double s)
{
scale = s;
for (int i = 0; i < actors.size(); i++)
for (size_t i = 0; i < actors.size(); i++)
{
actors[i]->SetScaleFactor(s);
}
......@@ -277,7 +277,7 @@ void
avtMultiCurveLabelMapper::SetMarkerLineWidth(_LineWidth lw)
{
markerLineWidth = lw;
for (int i = 0; i < actors.size(); i++)
for (size_t i = 0; i < actors.size(); i++)
{
actors[i]->SetLineWidth(LineWidth2Int(lw));
}
......@@ -304,14 +304,14 @@ avtMultiCurveLabelMapper::SetMarkerVisibility(bool labelsOn)
markerVisibility = labelsOn;
if (labelsOn)
{
for (int i = 0; i < actors.size(); i += 2)
for (size_t i = 0; i < actors.size(); i += 2)
{
actors[i]->UnHide();
}
}
else
{
for (int i = 0; i < actors.size(); i += 2)
for (size_t i = 0; i < actors.size(); i += 2)
{
actors[i]->Hide();
}
......@@ -339,14 +339,14 @@ avtMultiCurveLabelMapper::SetIdVisibility(bool labelsOn)
idVisibility = labelsOn;
if (labelsOn)
{
for (int i = 1; i < actors.size(); i += 2)
for (size_t i = 1; i < actors.size(); i += 2)
{
actors[i]->UnHide();
}
}