Index: trunk/psLib/src/dataManip/psFunctions.c
===================================================================
--- trunk/psLib/src/dataManip/psFunctions.c	(revision 4426)
+++ trunk/psLib/src/dataManip/psFunctions.c	(revision 4447)
@@ -7,6 +7,6 @@
  *  polynomials.  It also contains a Gaussian functions.
  *
- *  @version $Revision: 1.114 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-06-29 03:23:19 $
+ *  @version $Revision: 1.115 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-07-01 22:01:17 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -1084,5 +1084,5 @@
     newPoly->coeff = (psF32 *)psAlloc(n * sizeof(psF32));
     newPoly->coeffErr = (psF32 *)psAlloc(n * sizeof(psF32));
-    newPoly->mask = (psU8 *)psAlloc(n * sizeof(psU8));
+    newPoly->mask = (char *)psAlloc(n * sizeof(char));
     for (i = 0; i < n; i++) {
         newPoly->coeff[i] = 0.0;
@@ -1113,9 +1113,9 @@
     newPoly->coeff = (psF32 **)psAlloc(nX * sizeof(psF32 *));
     newPoly->coeffErr = (psF32 **)psAlloc(nX * sizeof(psF32 *));
-    newPoly->mask = (psU8 **)psAlloc(nX * sizeof(psU8 *));
+    newPoly->mask = (char **)psAlloc(nX * sizeof(char *));
     for (x = 0; x < nX; x++) {
         newPoly->coeff[x] = (psF32 *)psAlloc(nY * sizeof(psF32));
         newPoly->coeffErr[x] = (psF32 *)psAlloc(nY * sizeof(psF32));
-        newPoly->mask[x] = (psU8 *)psAlloc(nY * sizeof(psU8));
+        newPoly->mask[x] = (char *)psAlloc(nY * sizeof(char));
     }
     for (x = 0; x < nX; x++) {
@@ -1152,13 +1152,13 @@
     newPoly->coeff = (psF32 ***)psAlloc(nX * sizeof(psF32 **));
     newPoly->coeffErr = (psF32 ***)psAlloc(nX * sizeof(psF32 **));
-    newPoly->mask = (psU8 ***)psAlloc(nX * sizeof(psU8 **));
+    newPoly->mask = (char ***)psAlloc(nX * sizeof(char **));
     for (x = 0; x < nX; x++) {
         newPoly->coeff[x] = (psF32 **)psAlloc(nY * sizeof(psF32 *));
         newPoly->coeffErr[x] = (psF32 **)psAlloc(nY * sizeof(psF32 *));
-        newPoly->mask[x] = (psU8 **)psAlloc(nY * sizeof(psU8 *));
+        newPoly->mask[x] = (char **)psAlloc(nY * sizeof(char *));
         for (y = 0; y < nY; y++) {
             newPoly->coeff[x][y] = (psF32 *)psAlloc(nZ * sizeof(psF32));
             newPoly->coeffErr[x][y] = (psF32 *)psAlloc(nZ * sizeof(psF32));
-            newPoly->mask[x][y] = (psU8 *)psAlloc(nZ * sizeof(psU8));
+            newPoly->mask[x][y] = (char *)psAlloc(nZ * sizeof(char));
         }
     }
@@ -1201,17 +1201,17 @@
     newPoly->coeff = (psF32 ****)psAlloc(nX * sizeof(psF32 ***));
     newPoly->coeffErr = (psF32 ****)psAlloc(nX * sizeof(psF32 ***));
-    newPoly->mask = (psU8 ****)psAlloc(nX * sizeof(psU8 ***));
+    newPoly->mask = (char ****)psAlloc(nX * sizeof(char ***));
     for (x = 0; x < nX; x++) {
         newPoly->coeff[x] = (psF32 ***)psAlloc(nY * sizeof(psF32 **));
         newPoly->coeffErr[x] = (psF32 ***)psAlloc(nY * sizeof(psF32 **));
-        newPoly->mask[x] = (psU8 ***)psAlloc(nY * sizeof(psU8 **));
+        newPoly->mask[x] = (char ***)psAlloc(nY * sizeof(char **));
         for (y = 0; y < nY; y++) {
             newPoly->coeff[x][y] = (psF32 **)psAlloc(nZ * sizeof(psF32 *));
             newPoly->coeffErr[x][y] = (psF32 **)psAlloc(nZ * sizeof(psF32 *));
-            newPoly->mask[x][y] = (psU8 **)psAlloc(nZ * sizeof(psU8 *));
+            newPoly->mask[x][y] = (char **)psAlloc(nZ * sizeof(char *));
             for (z = 0; z < nZ; z++) {
                 newPoly->coeff[x][y][z] = (psF32 *)psAlloc(nT * sizeof(psF32));
                 newPoly->coeffErr[x][y][z] = (psF32 *)psAlloc(nT * sizeof(psF32));
-                newPoly->mask[x][y][z] = (psU8 *)psAlloc(nT * sizeof(psU8));
+                newPoly->mask[x][y][z] = (char *)psAlloc(nT * sizeof(char));
             }
         }
@@ -1446,5 +1446,5 @@
     newPoly->coeff = (psF64 *)psAlloc(n * sizeof(psF64));
     newPoly->coeffErr = (psF64 *)psAlloc(n * sizeof(psF64));
-    newPoly->mask = (psU8 *)psAlloc(n * sizeof(psU8));
+    newPoly->mask = (char *)psAlloc(n * sizeof(char));
     for (i = 0; i < n; i++) {
         newPoly->coeff[i] = 0.0;
@@ -1475,9 +1475,9 @@
     newPoly->coeff = (psF64 **)psAlloc(nX * sizeof(psF64 *));
     newPoly->coeffErr = (psF64 **)psAlloc(nX * sizeof(psF64 *));
-    newPoly->mask = (psU8 **)psAlloc(nX * sizeof(psU8 *));
+    newPoly->mask = (char **)psAlloc(nX * sizeof(char *));
     for (x = 0; x < nX; x++) {
         newPoly->coeff[x] = (psF64 *)psAlloc(nY * sizeof(psF64));
         newPoly->coeffErr[x] = (psF64 *)psAlloc(nY * sizeof(psF64));
-        newPoly->mask[x] = (psU8 *)psAlloc(nY * sizeof(psU8));
+        newPoly->mask[x] = (char *)psAlloc(nY * sizeof(char));
     }
     for (x = 0; x < nX; x++) {
@@ -1514,13 +1514,13 @@
     newPoly->coeff = (psF64 ***)psAlloc(nX * sizeof(psF64 **));
     newPoly->coeffErr = (psF64 ***)psAlloc(nX * sizeof(psF64 **));
-    newPoly->mask = (psU8 ***)psAlloc(nX * sizeof(psU8 **));
+    newPoly->mask = (char ***)psAlloc(nX * sizeof(char **));
     for (x = 0; x < nX; x++) {
         newPoly->coeff[x] = (psF64 **)psAlloc(nY * sizeof(psF64 *));
         newPoly->coeffErr[x] = (psF64 **)psAlloc(nY * sizeof(psF64 *));
-        newPoly->mask[x] = (psU8 **)psAlloc(nY * sizeof(psU8 *));
+        newPoly->mask[x] = (char **)psAlloc(nY * sizeof(char *));
         for (y = 0; y < nY; y++) {
             newPoly->coeff[x][y] = (psF64 *)psAlloc(nZ * sizeof(psF64));
             newPoly->coeffErr[x][y] = (psF64 *)psAlloc(nZ * sizeof(psF64));
-            newPoly->mask[x][y] = (psU8 *)psAlloc(nZ * sizeof(psU8));
+            newPoly->mask[x][y] = (char *)psAlloc(nZ * sizeof(char));
         }
     }
@@ -1563,17 +1563,17 @@
     newPoly->coeff = (psF64 ****)psAlloc(nX * sizeof(psF64 ***));
     newPoly->coeffErr = (psF64 ****)psAlloc(nX * sizeof(psF64 ***));
-    newPoly->mask = (psU8 ****)psAlloc(nX * sizeof(psU8 ***));
+    newPoly->mask = (char ****)psAlloc(nX * sizeof(char ***));
     for (x = 0; x < nX; x++) {
         newPoly->coeff[x] = (psF64 ***)psAlloc(nY * sizeof(psF64 **));
         newPoly->coeffErr[x] = (psF64 ***)psAlloc(nY * sizeof(psF64 **));
-        newPoly->mask[x] = (psU8 ***)psAlloc(nY * sizeof(psU8 **));
+        newPoly->mask[x] = (char ***)psAlloc(nY * sizeof(char **));
         for (y = 0; y < nY; y++) {
             newPoly->coeff[x][y] = (psF64 **)psAlloc(nZ * sizeof(psF64 *));
             newPoly->coeffErr[x][y] = (psF64 **)psAlloc(nZ * sizeof(psF64 *));
-            newPoly->mask[x][y] = (psU8 **)psAlloc(nZ * sizeof(psU8 *));
+            newPoly->mask[x][y] = (char **)psAlloc(nZ * sizeof(char *));
             for (z = 0; z < nZ; z++) {
                 newPoly->coeff[x][y][z] = (psF64 *)psAlloc(nT * sizeof(psF64));
                 newPoly->coeffErr[x][y][z] = (psF64 *)psAlloc(nT * sizeof(psF64));
-                newPoly->mask[x][y][z] = (psU8 *)psAlloc(nT * sizeof(psU8));
+                newPoly->mask[x][y][z] = (char *)psAlloc(nT * sizeof(char));
             }
         }
@@ -1822,6 +1822,6 @@
 XXX: What should be the defualty type for knots be?  psF32 is assumed.
  *****************************************************************************/
-psSpline1D *psSpline1DAlloc(int numSplines,
-                            int order,
+psSpline1D *psSpline1DAlloc(unsigned int numSplines,
+                            unsigned int order,
                             float min,
                             float max)
@@ -1867,5 +1867,5 @@
  *****************************************************************************/
 psSpline1D *psSpline1DAllocGeneric(const psVector *bounds,
-                                   int order)
+                                   unsigned int order)
 {
     PS_ASSERT_VECTOR_NON_NULL(bounds, NULL);
@@ -1874,6 +1874,6 @@
 
     psSpline1D *tmp = NULL;
-    psS32 i;
-    psS32 numSplines;
+    unsigned int i;
+    unsigned int numSplines;
 
     tmp = (psSpline1D *) psAlloc(sizeof(psSpline1D));
@@ -2045,5 +2045,5 @@
 psScalar *p_psVectorInterpolate(psVector *domain,
                                 psVector *range,
-                                psS32 order,
+                                unsigned int order,
                                 psScalar *x)
 {
@@ -2134,6 +2134,6 @@
     PS_ASSERT_VECTOR_TYPE(spline->knots, PS_TYPE_F32, NAN);
 
-    psS32 binNum;
-    psS32 n;
+    unsigned int binNum;
+    unsigned int n;
 
     n = spline->n;
@@ -2171,5 +2171,5 @@
     PS_ASSERT_VECTOR_TYPE(spline->knots, PS_TYPE_F32, NULL);
 
-    psS32 i;
+    unsigned int i;
     psVector *tmpVector;
 
