Changeset 3002

Timestamp:

Jan 14, 2005, 1:40:24 PM (22 years ago)

Author:

gusciora

Message:

Fixed error message.

Location:

trunk/psLib/src

Files:

• dataManip/psFunctions.c (modified) (2 diffs)
• math/psPolynomial.c (modified) (2 diffs)
• math/psSpline.c (modified) (2 diffs)

trunk/psLib/src/dataManip/psFunctions.c

@@ -7 +7 @@
  *  polynomials.  It also contains a Gaussian functions.
  *
- *  @version $Revision: 1.80 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-01-14 23:27:56 $
+ *  @version $Revision: 1.81 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-01-14 23:40:24 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -1912 +1912 @@
         (tmp->domains)[i] = bounds->data.F32[i];
         if (i<(bounds->n-1)) {
-            if (FLT_EPSILON < fabs(bounds->data.F32[i+1]-bounds->data.F32[i])) {
-                printf("ERROR: psErrorMsg(data points must be distinct\n");
-                // XXX: psErrorMsg(data points must be distinct)
+            if (FLT_EPSILON >= fabs(bounds->data.F32[i+1]-bounds->data.F32[i])) {
+                psError(PS_ERR_UNKNOWN, true, "data points must be distinct\n");
             }
         }

trunk/psLib/src/math/psPolynomial.c

@@ -7 +7 @@
  *  polynomials.  It also contains a Gaussian functions.
  *
- *  @version $Revision: 1.80 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-01-14 23:27:56 $
+ *  @version $Revision: 1.81 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-01-14 23:40:24 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -1912 +1912 @@
         (tmp->domains)[i] = bounds->data.F32[i];
         if (i<(bounds->n-1)) {
-            if (FLT_EPSILON < fabs(bounds->data.F32[i+1]-bounds->data.F32[i])) {
-                printf("ERROR: psErrorMsg(data points must be distinct\n");
-                // XXX: psErrorMsg(data points must be distinct)
+            if (FLT_EPSILON >= fabs(bounds->data.F32[i+1]-bounds->data.F32[i])) {
+                psError(PS_ERR_UNKNOWN, true, "data points must be distinct\n");
             }
         }

trunk/psLib/src/math/psSpline.c

@@ -7 +7 @@
  *  polynomials.  It also contains a Gaussian functions.
  *
- *  @version $Revision: 1.80 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-01-14 23:27:56 $
+ *  @version $Revision: 1.81 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-01-14 23:40:24 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -1912 +1912 @@
         (tmp->domains)[i] = bounds->data.F32[i];
         if (i<(bounds->n-1)) {
-            if (FLT_EPSILON < fabs(bounds->data.F32[i+1]-bounds->data.F32[i])) {
-                printf("ERROR: psErrorMsg(data points must be distinct\n");
-                // XXX: psErrorMsg(data points must be distinct)
+            if (FLT_EPSILON >= fabs(bounds->data.F32[i+1]-bounds->data.F32[i])) {
+                psError(PS_ERR_UNKNOWN, true, "data points must be distinct\n");
             }
         }