Changeset 3504

Timestamp:

Mar 14, 2013 11:45:20 PM (11 years ago)

Author:

ldelgass

Message:

In VTK reader, don't read ahead once we read lookup table line, also require
lookup table line and reset start pointer before reading lines after point
data header.

File:

• trunk/packages/vizservers/nanovis/VtkReader.cpp (modified) (2 diffs)

trunk/packages/vizservers/nanovis/VtkReader.cpp

@@ -182 +182 @@
                     return NULL;
                 }
+                for (start = line; *start == ' ' || *start == '\t'; start++)
+                    ;  // skip leading blanks
                 if (sscanf(start, "SCALARS %s %s", str, type) != 2) {
                     result.error("Error in data stream");
@@ -205 +207 @@
                     return NULL;
                 }
-                if (sscanf("LOOKUP_TABLE %s", str) == 1) {
-                    // skip line
+                for (start = line; *start == ' ' || *start == '\t'; start++)
+                    ;  // skip leading blanks
+                if (sscanf(start, "LOOKUP_TABLE %s", str) == 1) {
+                    // skip lookup table, but don't read ahead
                     if (fin.eof()) {
                         result.error("Error in data stream");
                         return NULL;
                     }
-                    fin.getline(line, sizeof(line) - 1);
-                    if (fin.fail()) {
-                        result.error("Error in data stream");
-                        return NULL;
-                    }
+                } else {
+                    // Lookup table line is required
+                    result.error("Missing LOOKUP_TABLE");
+                    return NULL;
                 }
                 // found start of field data