Changeset 5390 for branches/1.3

Timestamp:

May 1, 2015, 7:18:25 PM (9 years ago)

Author:

ldelgass

Message:

merge r5389 from trunk

Location:

branches/1.3

Files:

• . (modified) (1 prop)
• gui/src/RpDxToVtk.c (modified) (2 diffs)

branches/1.3/gui/src/RpDxToVtk.c

@@ -1 @@
-
+ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */
 /* 
  * ----------------------------------------------------------------------
@@ -602 +602 @@
         if (nPoints > 1 && ((dx == dy) && (dx == dz) && (dx == 0.0))) {
             fprintf(stderr, "Invalid deltas in DX file: %g %g %g\n", dx, dy, dz);
+            return TCL_ERROR;
+        }
+        if (dx < 0.0 || dy < 0.0 || dz < 0.0) {
+            fprintf(stderr, "Negative deltas not supported in DX file: %g %g %g\n", dx, dy, dz);
             return TCL_ERROR;
         }