Changeset 1946 for trunk/psLib/test/dataManip/tst_psFunc05.c

Timestamp:

Oct 3, 2004, 2:39:58 PM (22 years ago)

Author:

gusciora

Message:

Added memory corruption checks to these files.

File:

• trunk/psLib/test/dataManip/tst_psFunc05.c (modified) (5 diffs)

trunk/psLib/test/dataManip/tst_psFunc05.c

@@ -1 +1 @@
 /*****************************************************************************
-    This routine must ensure that the psSpline1DEval() function works
-    properly.  It creates a spline with psSpline1DAlloc(), creates a set of
-    data values, sets the spline polynomials with psVectorFitSpline1D(), then
-    calls psSpline1DEval() on new data values and ensures that the results
+    This routine must ensure that the psSpline1DEvalVector() function works
+    properly.  It creates a spline with psSpline1DAlloc(), (1-D functions
+    are used for the spline polynomials) creates a set of data values, sets
+    the spline polynomials with psVectorFitSpline1D(), then calls
+    psSpline1DEvalVector() on new data values and ensures that the results
     are correct.
- 
-    XXX: figure out the memory deallocator
  *****************************************************************************/
 #include <stdio.h>
@@ -14 +13 @@
 #include "psMemory.h"
 #include "psFunctions.h"
-
 #define N 8
+#define SPLINE_ORDER 1
 
 int main()
@@ -22 +21 @@
     int memLeaks=0;
     int i;
-    //    int  currentId = psMemGetId();
+    int  currentId = psMemGetId();
     psSpline1D *tmpSpline;
     psVector *data;
@@ -37 +36 @@
     data = psVectorAlloc(N+1, PS_TYPE_F32);
     x = psVectorAlloc(N+1, PS_TYPE_F32);
-    y = psVectorAlloc(N+1, PS_TYPE_F32);
-    tmpSpline = psSpline1DAlloc(N, 1, 1.0, 10.0);
+    tmpSpline = psSpline1DAlloc(N, SPLINE_ORDER, 1.0, 10.0);
 
     for (i=0;i<N+1;i++) {
@@ -59 +57 @@
     }
 
-    psFree(tmpSpline);
+    p_psSpline1DFree(tmpSpline);
+
+    psFree(x);
+    psFree(y);
+    psFree(data);
+
     psMemCheckCorruption(1);
-    //    memLeaks = psMemCheckLeaks(currentId,NULL,stderr);
+    memLeaks = psMemCheckLeaks(currentId,NULL,stderr);
     if (0 != memLeaks) {
         psAbort(__func__,"Memory Leaks! (%d leaks)", memLeaks);