Index: /trunk/psLib/src/dataManip/psFunctions.c
===================================================================
--- /trunk/psLib/src/dataManip/psFunctions.c	(revision 2438)
+++ /trunk/psLib/src/dataManip/psFunctions.c	(revision 2439)
@@ -7,6 +7,6 @@
  *  polynomials.  It also contains a Gaussian functions.
  *
- *  @version $Revision: 1.69 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-11-24 21:59:43 $
+ *  @version $Revision: 1.70 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-11-24 22:33:21 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -2112,6 +2112,8 @@
      the spline fit functions require F32 and F64.
  *****************************************************************************/
-float psSpline1DEval(const psSpline1D *spline,
-                     float x)
+float psSpline1DEval(
+    float x,
+    const psSpline1D *spline
+)
 {
     PS_PTR_CHECK_NULL(spline, NAN);
@@ -2144,6 +2146,8 @@
 // XXX: The spline eval functions require input and output to be F32.
 // however the spline fit functions require F32 and F64.
-psVector *psSpline1DEvalVector(const psVector *x,
-                               const psSpline1D *spline)
+psVector *psSpline1DEvalVector(
+    const psSpline1D *spline,
+    const psVector *x
+)
 {
     PS_PTR_CHECK_NULL(spline, NULL);
@@ -2157,9 +2161,15 @@
     if (x->type.type == PS_TYPE_F32) {
         for (i=0;i<x->n;i++) {
-            tmpVector->data.F32[i] = psSpline1DEval(spline, x->data.F32[i]);
+            tmpVector->data.F32[i] = psSpline1DEval(
+                                         x->data.F32[i],
+                                         spline
+                                     );
         }
     } else if (x->type.type == PS_TYPE_F64) {
         for (i=0;i<x->n;i++) {
-            tmpVector->data.F32[i] = psSpline1DEval(spline, (float) x->data.F64[i]);
+            tmpVector->data.F32[i] = psSpline1DEval(
+                                         (float) x->data.F64[i],
+                                         spline
+                                     );
         }
     } else {
Index: /trunk/psLib/src/dataManip/psFunctions.h
===================================================================
--- /trunk/psLib/src/dataManip/psFunctions.h	(revision 2438)
+++ /trunk/psLib/src/dataManip/psFunctions.h	(revision 2439)
@@ -12,6 +12,6 @@
 *  @author George Gusciora, MHPCC
 *
-*  @version $Revision: 1.35 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2004-11-24 21:59:43 $
+*  @version $Revision: 1.36 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2004-11-24 22:33:21 $
 *
 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -409,9 +409,13 @@
                                    psS32 order);
 
-float psSpline1DEval(const psSpline1D *spline,
-                     float x);
-
-psVector *psSpline1DEvalVector(const psVector *x,
-                               const psSpline1D *spline);
+float psSpline1DEval(
+    float x,
+    const psSpline1D *spline
+);
+
+psVector *psSpline1DEvalVector(
+    const psSpline1D *spline,
+    const psVector *x
+);
 
 psS32 p_psVectorBinDisect(psVector *bins,
Index: /trunk/psLib/src/dataManip/psMinimize.c
===================================================================
--- /trunk/psLib/src/dataManip/psMinimize.c	(revision 2438)
+++ /trunk/psLib/src/dataManip/psMinimize.c	(revision 2439)
@@ -9,6 +9,6 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.90 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-11-24 22:22:38 $
+ *  @version $Revision: 1.91 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-11-24 22:33:21 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
Index: /trunk/psLib/src/math/psMinimize.c
===================================================================
--- /trunk/psLib/src/math/psMinimize.c	(revision 2438)
+++ /trunk/psLib/src/math/psMinimize.c	(revision 2439)
@@ -9,6 +9,6 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.90 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-11-24 22:22:38 $
+ *  @version $Revision: 1.91 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-11-24 22:33:21 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
Index: /trunk/psLib/src/math/psPolynomial.c
===================================================================
--- /trunk/psLib/src/math/psPolynomial.c	(revision 2438)
+++ /trunk/psLib/src/math/psPolynomial.c	(revision 2439)
@@ -7,6 +7,6 @@
  *  polynomials.  It also contains a Gaussian functions.
  *
- *  @version $Revision: 1.69 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-11-24 21:59:43 $
+ *  @version $Revision: 1.70 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-11-24 22:33:21 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -2112,6 +2112,8 @@
      the spline fit functions require F32 and F64.
  *****************************************************************************/
-float psSpline1DEval(const psSpline1D *spline,
-                     float x)
+float psSpline1DEval(
+    float x,
+    const psSpline1D *spline
+)
 {
     PS_PTR_CHECK_NULL(spline, NAN);
@@ -2144,6 +2146,8 @@
 // XXX: The spline eval functions require input and output to be F32.
 // however the spline fit functions require F32 and F64.
-psVector *psSpline1DEvalVector(const psVector *x,
-                               const psSpline1D *spline)
+psVector *psSpline1DEvalVector(
+    const psSpline1D *spline,
+    const psVector *x
+)
 {
     PS_PTR_CHECK_NULL(spline, NULL);
@@ -2157,9 +2161,15 @@
     if (x->type.type == PS_TYPE_F32) {
         for (i=0;i<x->n;i++) {
-            tmpVector->data.F32[i] = psSpline1DEval(spline, x->data.F32[i]);
+            tmpVector->data.F32[i] = psSpline1DEval(
+                                         x->data.F32[i],
+                                         spline
+                                     );
         }
     } else if (x->type.type == PS_TYPE_F64) {
         for (i=0;i<x->n;i++) {
-            tmpVector->data.F32[i] = psSpline1DEval(spline, (float) x->data.F64[i]);
+            tmpVector->data.F32[i] = psSpline1DEval(
+                                         (float) x->data.F64[i],
+                                         spline
+                                     );
         }
     } else {
Index: /trunk/psLib/src/math/psPolynomial.h
===================================================================
--- /trunk/psLib/src/math/psPolynomial.h	(revision 2438)
+++ /trunk/psLib/src/math/psPolynomial.h	(revision 2439)
@@ -12,6 +12,6 @@
 *  @author George Gusciora, MHPCC
 *
-*  @version $Revision: 1.35 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2004-11-24 21:59:43 $
+*  @version $Revision: 1.36 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2004-11-24 22:33:21 $
 *
 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -409,9 +409,13 @@
                                    psS32 order);
 
-float psSpline1DEval(const psSpline1D *spline,
-                     float x);
-
-psVector *psSpline1DEvalVector(const psVector *x,
-                               const psSpline1D *spline);
+float psSpline1DEval(
+    float x,
+    const psSpline1D *spline
+);
+
+psVector *psSpline1DEvalVector(
+    const psSpline1D *spline,
+    const psVector *x
+);
 
 psS32 p_psVectorBinDisect(psVector *bins,
Index: /trunk/psLib/src/math/psSpline.c
===================================================================
--- /trunk/psLib/src/math/psSpline.c	(revision 2438)
+++ /trunk/psLib/src/math/psSpline.c	(revision 2439)
@@ -7,6 +7,6 @@
  *  polynomials.  It also contains a Gaussian functions.
  *
- *  @version $Revision: 1.69 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-11-24 21:59:43 $
+ *  @version $Revision: 1.70 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-11-24 22:33:21 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -2112,6 +2112,8 @@
      the spline fit functions require F32 and F64.
  *****************************************************************************/
-float psSpline1DEval(const psSpline1D *spline,
-                     float x)
+float psSpline1DEval(
+    float x,
+    const psSpline1D *spline
+)
 {
     PS_PTR_CHECK_NULL(spline, NAN);
@@ -2144,6 +2146,8 @@
 // XXX: The spline eval functions require input and output to be F32.
 // however the spline fit functions require F32 and F64.
-psVector *psSpline1DEvalVector(const psVector *x,
-                               const psSpline1D *spline)
+psVector *psSpline1DEvalVector(
+    const psSpline1D *spline,
+    const psVector *x
+)
 {
     PS_PTR_CHECK_NULL(spline, NULL);
@@ -2157,9 +2161,15 @@
     if (x->type.type == PS_TYPE_F32) {
         for (i=0;i<x->n;i++) {
-            tmpVector->data.F32[i] = psSpline1DEval(spline, x->data.F32[i]);
+            tmpVector->data.F32[i] = psSpline1DEval(
+                                         x->data.F32[i],
+                                         spline
+                                     );
         }
     } else if (x->type.type == PS_TYPE_F64) {
         for (i=0;i<x->n;i++) {
-            tmpVector->data.F32[i] = psSpline1DEval(spline, (float) x->data.F64[i]);
+            tmpVector->data.F32[i] = psSpline1DEval(
+                                         (float) x->data.F64[i],
+                                         spline
+                                     );
         }
     } else {
Index: /trunk/psLib/src/math/psSpline.h
===================================================================
--- /trunk/psLib/src/math/psSpline.h	(revision 2438)
+++ /trunk/psLib/src/math/psSpline.h	(revision 2439)
@@ -12,6 +12,6 @@
 *  @author George Gusciora, MHPCC
 *
-*  @version $Revision: 1.35 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2004-11-24 21:59:43 $
+*  @version $Revision: 1.36 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2004-11-24 22:33:21 $
 *
 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -409,9 +409,13 @@
                                    psS32 order);
 
-float psSpline1DEval(const psSpline1D *spline,
-                     float x);
-
-psVector *psSpline1DEvalVector(const psVector *x,
-                               const psSpline1D *spline);
+float psSpline1DEval(
+    float x,
+    const psSpline1D *spline
+);
+
+psVector *psSpline1DEvalVector(
+    const psSpline1D *spline,
+    const psVector *x
+);
 
 psS32 p_psVectorBinDisect(psVector *bins,
Index: /trunk/psLib/test/dataManip/tst_psFunc04.c
===================================================================
--- /trunk/psLib/test/dataManip/tst_psFunc04.c	(revision 2438)
+++ /trunk/psLib/test/dataManip/tst_psFunc04.c	(revision 2439)
@@ -46,5 +46,8 @@
     for (i=0;i<N+1;i++) {
         x = 0.5 + (float) i+1;
-        y = psSpline1DEval(tmpSpline, x);
+        y = psSpline1DEval(
+                x,
+                tmpSpline
+            );
         if (fabs(x-y) > FLT_EPSILON) {
             printf("ERROR: f(%f) is %f\n", x, y);
@@ -98,5 +101,8 @@
     for (i=0;i<N+1;i++) {
         x = 0.5 + (float) i+1;
-        y = psSpline1DEval(tmpSpline, x);
+        y = psSpline1DEval(
+                x,
+                tmpSpline
+            );
         if (fabs(x-y) > FLT_EPSILON) {
             printf("ERROR: f(%f) is %f\n", x, y);
Index: /trunk/psLib/test/dataManip/tst_psFunc05.c
===================================================================
--- /trunk/psLib/test/dataManip/tst_psFunc05.c	(revision 2438)
+++ /trunk/psLib/test/dataManip/tst_psFunc05.c	(revision 2439)
@@ -50,5 +50,8 @@
     }
 
-    y = psSpline1DEvalVector(x, tmpSpline);
+    y = psSpline1DEvalVector(
+            tmpSpline,
+            x
+        );
 
     for (i=0;i<N+1;i++) {
Index: /trunk/psLib/test/dataManip/tst_psFunc07.c
===================================================================
--- /trunk/psLib/test/dataManip/tst_psFunc07.c	(revision 2438)
+++ /trunk/psLib/test/dataManip/tst_psFunc07.c	(revision 2439)
@@ -70,5 +70,8 @@
 
     psVectorFitSpline1D(tmpSpline, x, y, NULL);
-    newY = psSpline1DEvalVector(newX, tmpSpline);
+    newY = psSpline1DEvalVector(
+               tmpSpline,
+               newX
+           );
 
     for (i=OFFSET;i<NUM_SPLINES-OFFSET+1;i++) {
@@ -139,5 +142,8 @@
 
     psVectorFitSpline1D(tmpSpline, x, y, NULL);
-    newY = psSpline1DEvalVector(newX, tmpSpline);
+    newY = psSpline1DEvalVector(
+               tmpSpline,
+               newX
+           );
 
     for (i=OFFSET;i<NUM_SPLINES-OFFSET+1;i++) {