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

Timestamp:

Sep 21, 2005, 4:47:16 PM (21 years ago)

Author:

gusciora

Message:

The nX terms for the polynomials now refer to the order, not the number
of terms.

File:

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

trunk/psLib/src/math/psSpline.c

@@ -7 +7 @@
 *  splines.
 *
-*  @version $Revision: 1.126 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2005-09-20 02:43:53 $
+*  @version $Revision: 1.127 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2005-09-22 02:47:16 $
 *
 *
@@ -383 +383 @@
     // If these are linear splines, which means their polynomials will have
     // two coefficients, then we do the simple calculation.
-    if (2 == (spline->spline[0])->n) {
+    if (1 == (spline->spline[0])->COOL_1D_n) {
         for (i=0;i<spline->n;i++) {
             slope = (y32->data.F32[i+1] - y32->data.F32[i]) /
@@ -402 +402 @@
 
     // Check if these are cubic splines (n==4).  If not, psError.
-    if (4 != (spline->spline[0])->n) {
+    if (3 != (spline->spline[0])->COOL_1D_n) {
         psError(PS_ERR_BAD_PARAMETER_SIZE, true,
                 "Don't know how to generate %u-order splines.",
-                (spline->spline[0])->n-1);
+                (spline->spline[0])->COOL_1D_n);
         return(NULL);
     }
@@ -745 +745 @@
     tmpSpline->spline = (psPolynomial1D **) psAlloc(numSplines * sizeof(psPolynomial1D *));
     for (unsigned int i=0;i<numSplines;i++) {
-        (tmpSpline->spline)[i] = psPolynomial1DAlloc(order+1, PS_POLYNOMIAL_ORD);
+        (tmpSpline->spline)[i] = psPolynomial1DAlloc(order, PS_POLYNOMIAL_ORD);
     }
 
@@ -809 +809 @@
     tmpSpline->spline = (psPolynomial1D **) psAlloc(numSplines * sizeof(psPolynomial1D *));
     for (unsigned int i=0;i<numSplines;i++) {
-        (tmpSpline->spline)[i] = psPolynomial1DAlloc(order+1, PS_POLYNOMIAL_ORD);
+        (tmpSpline->spline)[i] = psPolynomial1DAlloc(order, PS_POLYNOMIAL_ORD);
     }