Index: trunk/psLib/test/math/tap_psSpline1D.c
===================================================================
--- trunk/psLib/test/math/tap_psSpline1D.c	(revision 42336)
+++ trunk/psLib/test/math/tap_psSpline1D.c	(revision 42822)
@@ -107,7 +107,7 @@
         psSpline1D *tmpSpline = NULL;
         if (!xNull) {
-            tmpSpline = psSpline1DFitVector(xF32, yF32);
+	    tmpSpline = psSpline1DFitVector(xF32, yF32, NAN, NAN);
         } else {
-            tmpSpline = psSpline1DFitVector(NULL, yF32);
+            tmpSpline = psSpline1DFitVector(NULL, yF32, NAN, NAN);
         }
 
@@ -120,32 +120,15 @@
                 testStatus = false;
             }
-            if(tmpSpline->spline == NULL) {
-                diag("psSpline1DFitVector() returned a NULL psSpline1D->spline member.");
-                testStatus = false;
-            }
-            for (psS32 i = 0 ; i < NumSplines ; i++) {
-                if (tmpSpline->spline[i] == NULL) {
-                    diag("psSpline1DFitVector() returned a NULL psSpline1D->spline[%d] member.", i);
-                    testStatus = false;
-                }
-            }
-            if (tmpSpline->knots == NULL) {
+            if (tmpSpline->xKnots == NULL) {
                 diag("psSpline1DFitVector() returned a NULL psSpline1D->knots member");
                 testStatus = false;
             }
-            if (tmpSpline->p_psDeriv2 == NULL) {
+            if (tmpSpline->yKnots == NULL) {
+                diag("psSpline1DFitVector() returned a NULL psSpline1D->knots member");
+                testStatus = false;
+            }
+            if (tmpSpline->d2yKnots == NULL) {
                 diag("psSpline1DFitVector()returned a NULL psSpline1D->p_psDeriv2 member");
                 testStatus = false;
-            }
-
-            // Test psSpline1DEval()
-            for (psS32 i=0;i<NumSplines;i++) {
-                psF32 x = 0.5 + (float) i;
-                psF32 y = psSpline1DEval(tmpSpline, x);
-                if (CheckErrorF32(y, func(x))) {
-                    testStatus = false;
-                    diag("TEST ERROR: f(%f) is %f, should be %f", x, y, myFunc00(x));
-		    // XXX EAM : the truth value above should be 'func' not myFunc00
-                }
             }
 
@@ -196,7 +179,7 @@
         psSpline1D *tmpSpline = NULL;
         if (!xNull) {
-            tmpSpline = psSpline1DFitVector(xF64, yF64);
+            tmpSpline = psSpline1DFitVector(xF64, yF64, NAN, NAN);
         } else {
-            tmpSpline = psSpline1DFitVector(NULL, yF64);
+            tmpSpline = psSpline1DFitVector(NULL, yF64, NAN, NAN);
         }
         if(tmpSpline == NULL) {
@@ -208,20 +191,14 @@
                 testStatus = false;
             }
-            if(tmpSpline->spline == NULL) {
-                diag("psSpline1DFitVector() returned a NULL psSpline1D->spline member.");
-                testStatus = false;
-            }
-            for (psS32 i = 0 ; i < NumSplines ; i++) {
-                if (tmpSpline->spline[i] == NULL) {
-                    diag("psSpline1DFitVector() returned a NULL psSpline1D->spline[%d] member.", i);
-                    testStatus = false;
-                }
-            }
-            if (tmpSpline->knots == NULL) {
-                diag("psSpline1DFitVector() returned a NULL psSpline1D->knots member");
-                testStatus = false;
-            }
-            if (tmpSpline->p_psDeriv2 == NULL) {
-                diag("psSpline1DFitVector()returned a NULL psSpline1D->p_psDeriv2 member");
+            if (tmpSpline->xKnots == NULL) {
+                diag("psSpline1DFitVector() returned a NULL psSpline1D->xKnots member");
+                testStatus = false;
+            }
+            if (tmpSpline->yKnots == NULL) {
+                diag("psSpline1DFitVector() returned a NULL psSpline1D->yKnots member");
+                testStatus = false;
+            }
+            if (tmpSpline->d2yKnots == NULL) {
+                diag("psSpline1DFitVector()returned a NULL psSpline1D->d2yKnots member");
                 testStatus = false;
             }
@@ -278,7 +255,7 @@
         skip_start(tmpSpline == NULL, 4, "Skipping tests because psSpline1DAlloc() failed");
         ok(tmpSpline->n == 0, "psSpline1DAlloc() properly set the psSpline1D->n member");
-        ok(tmpSpline->spline == NULL, "psSpline1DAlloc() properly set the psSpline1D->spline member");
-        ok(tmpSpline->knots == NULL, "psSpline1DAlloc() properly set the psSpline1D->knots member");
-        ok(tmpSpline->p_psDeriv2 == NULL, "psSpline1DAlloc() properly set the psSpline1D->p_psDeriv2 member");
+        ok(tmpSpline->xKnots   == NULL, "psSpline1DAlloc() properly set the psSpline1D->xKnots member");
+        ok(tmpSpline->yKnots   == NULL, "psSpline1DAlloc() properly set the psSpline1D->yKnots member");
+        ok(tmpSpline->d2yKnots == NULL, "psSpline1DAlloc() properly set the psSpline1D->d2yKnots member");
         psFree(tmpSpline);
         skip_end();
@@ -289,5 +266,5 @@
     {
         psMemId id = psMemGetId();
-        psSpline1D *tmpSpline = psSpline1DFitVector(NULL, NULL);
+        psSpline1D *tmpSpline = psSpline1DFitVector(NULL, NULL, NAN, NAN);
         ok(tmpSpline == NULL, "psSpline1DFitVector() returns NULL with NULL arguments");
         ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks");