Commit 90e1a028 authored by allens's avatar allens

added casesand type to cleanup warnings

git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@29195 18c085ea-50e0-402c-830e-de6fd14e8384
parent 6dd22c68
......@@ -3358,6 +3358,13 @@ PP_ZFileReader::GetMarkerVar(int state, const std::string &varStr)
retval = vtkCharArray::New();
break;
}
case SHORT_TYPE:
case SHORTARRAY_TYPE:
{
EXCEPTION1(InvalidVariableException, "Short Type");
// retval = vtkShortArray::New();
break;
}
case INTEGER_TYPE:
case INTEGERARRAY_TYPE:
{
......@@ -3382,6 +3389,12 @@ PP_ZFileReader::GetMarkerVar(int state, const std::string &varStr)
retval = vtkDoubleArray::New();
break;
}
case NO_TYPE:
EXCEPTION1(InvalidVariableException, "No Type");
break;
case OBJECT_TYPE:
EXCEPTION1(InvalidVariableException, "Object Type");
break;
}
retval->SetVoidArray(vals, nvals, 0);
......@@ -4430,6 +4443,3 @@ PP_ZFileReader::RevolveDataSet(vtkDataSet *in_ds, const double *axis,
return retval;
}
......@@ -1697,7 +1697,7 @@ avtVsFileFormat::getUnstructuredMesh(VsUnstructuredMesh* unstructuredMesh,
<< numSpatialDims << " is less than 3. "
<< "Moving data into correct location." << std::endl;
for (size_t i=numNodes-1; i>=0; --i)
for (int i=numNodes-1; i>=0; --i)
{
unsigned char* destPtr
= (unsigned char*) dataPtr + i*3*dsize;
......
......@@ -58,7 +58,7 @@ size_t fread_loop(void *bufp, size_t elemSize, size_t elems2Read, FILE *theFile)
if (!numread) { /* EOF */
return totalRead;
}
if (numread < 0) {
if (numread != elems2Read - totalRead) {
fprintf(stderr, "Warning: bad read in fread_loop, continuing...\n");
}
bufp = (void*)((char*)bufp + numread);
......
......@@ -2029,6 +2029,8 @@ QvisPoincareWindow::UpdateMeshTypeAttributes()
singlePlaneLabel->show();
singlePlane->show();
break;
case PoincareAttributes::Surfaces:
break;
}
}
......
......@@ -77,6 +77,9 @@ Viewer_LogQtMessages(QtMsgType type, const char *msg)
{
switch(type)
{
case QtInfoMsg:
debug1 << "Qt: Info: " << msg << endl;
break;
case QtDebugMsg:
debug1 << "Qt: Debug: " << msg << endl;
break;
......@@ -96,8 +99,11 @@ Viewer_LogQtMessages(QtMsgType type, const char *msg)
static void
Viewer_LogQtMessages(QtMsgType type, const QMessageLogContext &context, const QString& msg)
{
switch(type)
switch(type)
{
case QtInfoMsg:
debug1 << "Qt: Info: " << msg.toStdString() << endl;
break;
case QtDebugMsg:
debug1 << "Qt: Debug: " << msg.toStdString() << endl;
break;
......
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