Changeset 5072 for trunk/psLib/src/math/psSpline.c

Timestamp:

Sep 19, 2005, 4:43:53 PM (21 years ago)

Author:

drobbin

Message:

added psLogGet fxns and updated spline functions for unsigned int compatability

File:

• trunk/psLib/src/math/psSpline.c (modified) (8 diffs)

trunk/psLib/src/math/psSpline.c

@@ -7 +7 @@
 *  splines.
 *
-*  @version $Revision: 1.125 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2005-09-19 22:50:28 $
+*  @version $Revision: 1.126 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2005-09-20 02:43:53 $
 *
 *
@@ -43 +43 @@
 /*****************************************************************************/
 static void spline1DFree(psSpline1D *tmpSpline);
-static unsigned int vectorBinDisectF32(psF32 *bins,psS32 numBins,psF32 x);
-static unsigned int vectorBinDisectS32(psS32 *bins,psS32 numBins,psS32 x);
+static unsigned int vectorBinDisectF32(psF32 *bins,unsigned int numBins,psF32 x);
+static unsigned int vectorBinDisectS32(psS32 *bins,unsigned int numBins,psS32 x);
 
 /*****************************************************************************/
@@ -113 +113 @@
     \
     psTrace(".psLib.dataManip.psSpline.fullInterpolate1D##TYPE", 4, \
-            "---- fullInterpolate1D##TYPE() begin (%d-order at x=%f) (%d data points)----\n", n-1, x, n); \
+            "---- fullInterpolate1D##TYPE() begin (%u-order at x=%f) (%d data points)----\n", n-1, x, n); \
     \
     for (i=0;i<n;i++) { \
@@ -123 +123 @@
         p->data.TYPE[i] = range[i]; \
         psTrace(".psLib.dataManip.psSpline.fullInterpolate1D##TYPE", 6, \
-                "p->data.TYPE[%d] is %f\n", i, p->data.TYPE[i]); \
+                "p->data.TYPE[%u] is %f\n", i, p->data.TYPE[i]); \
         \
     } \
@@ -140 +140 @@
              */ \
             psTrace(".psLib.dataManip.psSpline.fullInterpolate1D##TYPE", 6, \
-                    "p->data.TYPE[%d] is %f\n", i, p->data.TYPE[i]); \
+                    "p->data.TYPE[%u] is %f\n", i, p->data.TYPE[i]); \
         } \
     } \
@@ -841 +841 @@
 #define FUNC_MACRO_VECTOR_BIN_DISECT(TYPE) \
 static unsigned int vectorBinDisect##TYPE(ps##TYPE *bins, \
-        psS32 numBins, \
+        unsigned int numBins, \
         ps##TYPE x) \
 { \
-    psS32 min; \
-    psS32 max; \
-    psS32 mid; \
+    unsigned int min; \
+    unsigned int max; \
+    unsigned int mid; \
     \
     psTrace(".psLib.dataManip.psSpline.vectorBinDisect##TYPE", 4, \
@@ -871 +871 @@
     while (min != max) { \
         psTrace(".psLib.dataManip.psSpline.vectorBinDisect##TYPE", 4, \
-                "(min, mid, max) is (%d, %d, %d): (x, bins) is (%f, %f)\n", \
+                "(min, mid, max) is (%u, %u, %u): (x, bins) is (%f, %f)\n", \
                 min, mid, max, x, bins[mid]); \
         \
         if (x == bins[mid]) { \
             psTrace(".psLib.dataManip.psSpline.vectorBinDisect##TYPE", 4, \
-                    "---- Exiting vectorBinDisect##TYPE(): bin %d\n", mid); \
+                    "---- Exiting vectorBinDisect##TYPE(): bin %u\n", mid); \
             return(mid); \
         } else if (x < bins[mid]) { \
@@ -887 +887 @@
     \
     psTrace(".psLib.dataManip.psSpline.vectorBinDisect##TYPE", 4, \
-            "---- Exiting vectorBinDisect##TYPE(): bin %d\n", min); \
+            "---- Exiting vectorBinDisect##TYPE(): bin %u\n", min); \
     return(min); \
 } \