Changeset 5328

Timestamp:

Apr 27, 2015 3:30:28 PM (9 years ago)

Author:

ldelgass

Message:

add delta checks to nanovis unirect DX parser

File:

• nanovis/trunk/Unirect.cpp (modified) (2 diffs)

nanovis/trunk/Unirect.cpp

@@ -522 +522 @@
         } else if (sscanf(line, "delta %lg %lg %lg", &ddx, &ddy, &ddz) == 3) {
             /* Found one of the delta lines. */
+            int count = 0;
             if (ddx != 0.0) {
                 dx = ddx;
+                count++;
             } else if (ddy != 0.0) {
                 dy = ddy;
+                count++;
             } else if (ddz != 0.0) {
                 dz = ddz;
+                count++;
+            }
+            if (count > 1) {
+                ERROR("don't know how to handle multiple non-zero delta values");
+                return false;
             }
         } else if (sscanf(line, "object %*d class array type %*s shape 3"
@@ -555 +563 @@
         ERROR("inconsistent data: expected %d points"
               " but found %d points", nx*ny*nz, npts);
+        return false;
+    }
+    if (npts > 1 && ((dx == dy) && (dx == dz) && (dx == 0.0))) {
+        ERROR("Missing or invalid deltas in DX file: %g %g %g", dx, dy, dz);
+        return false;
+    }
+    if (dx < 0.0 || dy < 0.0 || dz < 0.0) {
+        ERROR("Negative deltas not supported in DX file: %g %g %g", dx, dy, dz);
         return false;
     }