Changeset 5570 for branches/eam_rel8_b1/psLib/src/math/psPolynomial.c

Timestamp:

Nov 22, 2005, 9:54:55 AM (21 years ago)

Author:

magnier

Message:

fixed compilation bugs

File:

• branches/eam_rel8_b1/psLib/src/math/psPolynomial.c (modified) (6 diffs)

branches/eam_rel8_b1/psLib/src/math/psPolynomial.c

@@ -7 +7 @@
 *  polynomials.  It also contains a Gaussian functions.
 *
-*  @version $Revision: 1.130.4.1.2.1 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2005-11-22 18:04:28 $
+*  @version $Revision: 1.130.4.1.2.2 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2005-11-22 19:54:55 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -784 +784 @@
 }
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
 psF64 psPolynomial1DEval(const psPolynomial1D* poly,
                          psF64 x)
@@ -829 +807 @@
     PS_ASSERT_POLY_NON_NULL(poly, NULL);
     PS_ASSERT_VECTOR_NON_NULL(x, NULL);
-    // PS_ASSERT_VECTOR_TYPE(x, PS_TYPE_F64, NULL);
+    PS_ASSERT_VECTOR_TYPE_F32_OR_F64(x, NULL);
 
     psVector *tmp;
 
-    switch (x->type) {
+    switch (x->type.type) {
     case PS_TYPE_F64:
         tmp = psVectorAlloc(x->n, PS_TYPE_F64);
@@ -880 +858 @@
     PS_ASSERT_POLY_NON_NULL(poly, NULL);
     PS_ASSERT_VECTOR_NON_NULL(x, NULL);
-    PS_ASSERT_VECTOR_TYPE(x, PS_TYPE_F64, NULL);
+    PS_ASSERT_VECTOR_TYPE_F32_OR_F64(x, NULL);
     PS_ASSERT_VECTOR_NON_NULL(y, NULL);
-    PS_ASSERT_VECTOR_TYPE(y, PS_TYPE_F64, NULL);
+    PS_ASSERT_VECTOR_TYPE_F32_OR_F64(y, NULL);
 
     psVector *tmp;
@@ -892 +870 @@
     }
 
-    switch (x->type) {
+    switch (x->type.type) {
     case PS_TYPE_F32:
-        if (y->type != x->type) {
+        if (y->type.type != x->type.type) {
             psError(PS_ERR_UNKNOWN, true, "type mismatch in data vectors");
             return (NULL);
@@ -908 +886 @@
         break;
     case PS_TYPE_F64:
-        if (y->type != x->type) {
+        if (y->type.type != x->type.type) {
             psError(PS_ERR_UNKNOWN, true, "type mismatch in data vectors");
             return (NULL);