Changeset 4567

Timestamp:

Jul 15, 2005, 1:19:41 PM (21 years ago)

Author:

gusciora

Message:

/

File:

• trunk/psLib/src/math/psFunctions.c (modified) (3 diffs)

trunk/psLib/src/math/psFunctions.c

@@ -7 +7 @@
  *  polynomials.  It also contains a Gaussian functions.
  *
- *  @version $Revision: 1.1 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-07-12 19:12:01 $
+ *  @version $Revision: 1.2 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-07-15 23:19:41 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -1873 +1873 @@
     PS_ASSERT_INT_NONNEGATIVE(order, NULL);
 
-    psSpline1D *tmp = NULL;
+    psSpline1D *tmpSpline = NULL;
     unsigned int i;
     unsigned int numSplines;
 
-    tmp = (psSpline1D *) psAlloc(sizeof(psSpline1D));
+    tmpSpline = (psSpline1D *) psAlloc(sizeof(psSpline1D));
 
     numSplines = bounds->n - 1;
-    tmp->n = numSplines;
-
-    tmp->spline = (psPolynomial1D **) psAlloc(numSplines * sizeof(psPolynomial1D *));
+    tmpSpline->n = numSplines;
+
+    tmpSpline->spline = (psPolynomial1D **) psAlloc(numSplines * sizeof(psPolynomial1D *));
     for (i=0;i<numSplines;i++) {
-        (tmp->spline)[i] = psPolynomial1DAlloc(order+1, PS_POLYNOMIAL_ORD);
+        (tmpSpline->spline)[i] = psPolynomial1DAlloc(order+1, PS_POLYNOMIAL_ORD);
     }
 
     // This should be set by the psVectorFitSpline1D()
-    tmp->p_psDeriv2 = NULL;
-
-    tmp->knots = psVectorAlloc(bounds->n, PS_TYPE_F32);
+    tmpSpline->p_psDeriv2 = NULL;
+
+    tmpSpline->knots = psVectorAlloc(bounds->n, PS_TYPE_F32);
 
     for (i=0;i<bounds->n;i++) {
-        tmp->knots->data.F32[i] = bounds->data.F32[i];
+        tmpSpline->knots->data.F32[i] = bounds->data.F32[i];
         if (i<(bounds->n-1)) {
             if (FLT_EPSILON >= fabs(bounds->data.F32[i+1]-bounds->data.F32[i])) {
@@ -1901 +1901 @@
     }
 
-    psMemSetDeallocator(tmp,(psFreeFunc)spline1DFree);
-    return(tmp);
+    psMemSetDeallocator(tmpSpline,(psFreeFunc)spline1DFree);
+    return(tmpSpline);
 }