Changeset 5431

Timestamp:

May 6, 2015 1:01:23 PM (9 years ago)

Author:

ldelgass

Message:

merge r5430 from trunk

Location:

nanovis/branches/1.2

Files:

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

nanovis/branches/1.2/Unirect.cpp

@@ -497 +497 @@
     char *p, *pend;
 
-    dx = dy = dz = 0.0;                 /* Suppress compiler warning. */
+    dx = dy = dz = 0.0;
     x0 = y0 = z0 = 0.0;                 /* May not have an origin line. */
-    nx = ny = nz = npts = 0;            /* Suppress compiler warning. */
+    nx = ny = nz = npts = 0;
     for (p = string, pend = p + length; p < pend; /*empty*/) {
         char *line;
@@ -525 +525 @@
                 dx = ddx;
                 count++;
-            } else if (ddy != 0.0) {
+            }
+            if (ddy != 0.0) {
                 dy = ddy;
                 count++;
-            } else if (ddz != 0.0) {
+            }
+            if (ddz != 0.0) {
                 dz = ddz;
                 count++;