Changeset 5461

Timestamp:

May 7, 2015 4:38:35 AM (8 years ago)

Author:

ldelgass

Message:

merge r5460 from nanovis trunk

Location:

nanovis/branches/1.2

Files:

• . (modified) (1 prop)
• Unirect.cpp (modified) (2 diffs)

nanovis/branches/1.2/Unirect.cpp

@@ -538 +538 @@
                 return false;
             }
-        } else if (sscanf(line, "object %*d class array type %*s shape 3"
-                " rank 1 items %d data follows", &npts) == 1) {
+        } else if (sscanf(line, "object %*d class array type %*s rank 1"
+                " shape 3 items %d data follows", &npts) == 1) {
             if (npts < 0) {
                 ERROR("bad # points %d", npts);
@@ -545 +545 @@
             }
             TRACE("#points=%d", npts);
-            if (npts != nx*ny*nz) {
-                ERROR("inconsistent data: expected %d points"
-                      " but found %d points", nx*ny*nz, npts);
-                return false;
-            }
-            break;
-        } else if (sscanf(line, "object %*d class array type %*s rank 0"
-                " times %d data follows", &npts) == 1) {
             if (npts != nx*ny*nz) {
                 ERROR("inconsistent data: expected %d points"