Changeset 3882

Timestamp:

Aug 21, 2013 11:47:45 PM (10 years ago)

Author:

ldelgass

Message:

Fix warnings

File:

• trunk/gui/src/RpDxToVtk.c (modified) (17 diffs)

trunk/gui/src/RpDxToVtk.c

@@ -24 +24 @@
 
 #define DO_WEDGES
+//#define CHECK_WINDINGS
 
 static INLINE char *
@@ -57 +58 @@
     const char *p;
     char mesg[2000];
-    double *array, scale, vmin, vmax;
+    double *array;
     int iX, iY, iZ;
 
@@ -65 +66 @@
         return TCL_ERROR;
     }
-    vmin = DBL_MAX, vmax = -DBL_MAX;
     iX = iY = iZ = 0;
     for (i = 0; i < nPoints; i++) {
@@ -93 +93 @@
         }
         array[loc] = value;
-        if (value < vmin) {
-            vmin = value;
-        } 
-        if (value > vmax) {
-            vmax = value;
-        }
-    }
-    scale = 1.0 / (vmax - vmin);
+    }
     for (i = 0; i < nPoints; i++) {
-#ifdef notdef
-        sprintf(mesg, "%g\n", (array[i] - vmin) * scale);
-#endif
         sprintf(mesg, "%g\n", array[i]);
         Tcl_AppendToObj(objPtr, mesg, -1);
@@ -120 +110 @@
     const char *p;
     char mesg[2000];
-    double *array, scale, vmin, vmax;
+    double *array;
 
     p = *stringPtr;
@@ -127 +117 @@
         return TCL_ERROR;
     }
-    vmin = DBL_MAX, vmax = -DBL_MAX;
     for (i = 0; i < nPoints; i++) {
         double value;
@@ -145 +134 @@
         p = nextPtr;
         array[i] = value;
-        if (value < vmin) {
-            vmin = value;
-        } 
-        if (value > vmax) {
-            vmax = value;
-        }
-    }
-    scale = 1.0 / (vmax - vmin);
+    }
     for (i = 0; i < nPoints; i++) {
-#ifdef notdef
-        sprintf(mesg, "%g\n", (array[i] - vmin) * scale);
-#endif
         sprintf(mesg, "%g\n", array[i]);
         Tcl_AppendToObj(objPtr, mesg, -1);
@@ -172 +151 @@
     const char *p;
     char mesg[2000];
-    double *array, scale, vmin, vmax;
+    double *array;
     int iXY, iZ;
     int nPoints;
@@ -183 +162 @@
         return TCL_ERROR;
     }
-    vmin = DBL_MAX, vmax = -DBL_MAX;
     iXY = iZ = 0;
     for (i = 0; i < nPoints; i++) {
@@ -208 +186 @@
         }
         array[loc] = value;
-        if (value < vmin) {
-            vmin = value;
-        } 
-        if (value > vmax) {
-            vmax = value;
-        }
-    }
-    scale = 1.0 / (vmax - vmin);
+    }
     for (i = 0; i < nPoints; i++) {
-#ifdef notdef
-        sprintf(mesg, "%g\n", (array[i] - vmin) * scale);
-#endif
         sprintf(mesg, "%g\n", array[i]);
         Tcl_AppendToObj(objPtr, mesg, -1);
@@ -278 +246 @@
     return TCL_OK;
 }
-
+#if defined(DO_WEDGES) && defined(CHECK_WINDINGS)
 static void
 Normalize(double v[3])
@@ -301 +269 @@
     vout[2] = v1[0]*v2[1] - v1[1]*v2[0];
 }
-
+#endif
 /* 
  *  DxToVtk string
@@ -565 +533 @@
         for (iz = 0; iz < count[2]; iz++) {
             for (i = 0; i < nXYPoints; i++) {
-                sprintf(mesg, "%g %g %g\n", points[i*2], points[i*2+1], origin[2] + dz * iz);
+                sprintf(mesg, "%g %g %g\n", points[i*2], points[i*2+1], (origin[2] + dz * iz));
                 Tcl_AppendToObj(pointsObjPtr, mesg, -1);
             }
@@ -616 +584 @@
             }
             fclose(ftmp);
-#ifdef notdef
+#ifdef CHECK_WINDINGS
             double normal[3];
             normal[0] = normal[1] = 0.0;
@@ -637 +605 @@
                         // skip boundary points we added
                         if (c0 >= 0 && c1 >= 0 && c2 >= 0) {
-#ifdef notdef
+#ifdef CHECK_WINDINGS
                             /* Winding of base triangle should point to 
                                outside of cell using right hand rule */
@@ -675 +643 @@
             unlink(fcells);
         }
-        free(points);
         sprintf(mesg, "CELLS %d %d\n", nCells, 7*nCells);
         Tcl_AppendToObj(objPtr, mesg, -1);
@@ -686 +653 @@
         }
 #endif
+        if (points != NULL) {
+            free(points);
+        }
         sprintf(mesg, "POINT_DATA %d\n", nPoints);
         Tcl_AppendToObj(objPtr, mesg, -1);