Commit f3b5eb36 authored by Brad King's avatar Brad King 💬
Browse files

BUG: Tabs should count as whitespace (from Amy).

parent b143bc7c
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
#include <vtkstd/string> #include <vtkstd/string>
#include <vtkstd/vector> #include <vtkstd/vector>
vtkCxxRevisionMacro(vtkEnSightReader, "1.57"); vtkCxxRevisionMacro(vtkEnSightReader, "1.58");
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
typedef vtkstd::vector< vtkSmartPointer<vtkIdList> > vtkEnSightReaderCellIdsTypeBase; typedef vtkstd::vector< vtkSmartPointer<vtkIdList> > vtkEnSightReaderCellIdsTypeBase;
...@@ -517,14 +517,14 @@ int vtkEnSightReader::ReadCaseFile() ...@@ -517,14 +517,14 @@ int vtkEnSightReader::ReadCaseFile()
{ {
if (strncmp(line, "model:", 6) == 0) if (strncmp(line, "model:", 6) == 0)
{ {
if (sscanf(line, " %*s %d%*[ ]%d%*[ ]%s", &timeSet, &fileSet, subLine) == 3) if (sscanf(line, " %*s %d%*[ \t]%d%*[ \t]%s", &timeSet, &fileSet, subLine) == 3)
{ {
this->GeometryTimeSet = timeSet; this->GeometryTimeSet = timeSet;
this->GeometryFileSet = fileSet; this->GeometryFileSet = fileSet;
this->SetGeometryFileName(subLine); this->SetGeometryFileName(subLine);
vtkDebugMacro(<<this->GetGeometryFileName()); vtkDebugMacro(<<this->GetGeometryFileName());
} }
else if (sscanf(line, " %*s %d%*[ ]%s", &timeSet, subLine) == 2) else if (sscanf(line, " %*s %d%*[ \t]%s", &timeSet, subLine) == 2)
{ {
this->GeometryTimeSet = timeSet; this->GeometryTimeSet = timeSet;
this->SetGeometryFileName(subLine); this->SetGeometryFileName(subLine);
...@@ -538,14 +538,14 @@ int vtkEnSightReader::ReadCaseFile() ...@@ -538,14 +538,14 @@ int vtkEnSightReader::ReadCaseFile()
} }
else if (strncmp(line, "measured:", 9) == 0) else if (strncmp(line, "measured:", 9) == 0)
{ {
if (sscanf(line, " %*s %d%*[ ]%d%*[ ]%s", &timeSet, &fileSet, subLine) == 3) if (sscanf(line, " %*s %d%*[ \t]%d%*[ \t]%s", &timeSet, &fileSet, subLine) == 3)
{ {
this->MeasuredTimeSet = timeSet; this->MeasuredTimeSet = timeSet;
this->MeasuredFileSet = fileSet; this->MeasuredFileSet = fileSet;
this->SetMeasuredFileName(subLine); this->SetMeasuredFileName(subLine);
vtkDebugMacro(<< this->GetMeasuredFileName()); vtkDebugMacro(<< this->GetMeasuredFileName());
} }
else if (sscanf(line, " %*s %d%*[ ]%s", &timeSet, subLine) == 2) else if (sscanf(line, " %*s %d%*[ \t]%s", &timeSet, subLine) == 2)
{ {
this->MeasuredTimeSet = timeSet; this->MeasuredTimeSet = timeSet;
this->SetMeasuredFileName(subLine); this->SetMeasuredFileName(subLine);
......
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
#include <assert.h> #include <assert.h>
#include <ctype.h> /* isspace */ #include <ctype.h> /* isspace */
vtkCxxRevisionMacro(vtkGenericEnSightReader, "1.73"); vtkCxxRevisionMacro(vtkGenericEnSightReader, "1.74");
vtkStandardNewMacro(vtkGenericEnSightReader); vtkStandardNewMacro(vtkGenericEnSightReader);
vtkCxxSetObjectMacro(vtkGenericEnSightReader,TimeSets, vtkCxxSetObjectMacro(vtkGenericEnSightReader,TimeSets,
...@@ -354,7 +354,7 @@ int vtkGenericEnSightReader::DetermineEnSightVersion() ...@@ -354,7 +354,7 @@ int vtkGenericEnSightReader::DetermineEnSightVersion()
fileSet = xfileSet; fileSet = xfileSet;
this->SetGeometryFileName(subLine); this->SetGeometryFileName(subLine);
} }
else if (sscanf(line, " %*s %d%*[ ]%s", &xtimeSet, subLine) == 2) else if (sscanf(line, " %*s %d%*[ \t]%s", &xtimeSet, subLine) == 2)
{ {
timeSet = xtimeSet; timeSet = xtimeSet;
this->SetGeometryFileName(subLine); this->SetGeometryFileName(subLine);
...@@ -455,7 +455,7 @@ int vtkGenericEnSightReader::DetermineEnSightVersion() ...@@ -455,7 +455,7 @@ int vtkGenericEnSightReader::DetermineEnSightVersion()
fileSet = xfileSet; fileSet = xfileSet;
this->SetGeometryFileName(subLine); this->SetGeometryFileName(subLine);
} }
else if (sscanf(line, " %*s %d%*[ ]%s", &xtimeSet, subLine) == 2) else if (sscanf(line, " %*s %d%*[ \t]%s", &xtimeSet, subLine) == 2)
{ {
timeSet = xtimeSet; timeSet = xtimeSet;
this->SetGeometryFileName(subLine); this->SetGeometryFileName(subLine);
......
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