Changeset 3884 for trunk/psLib/src/image

Timestamp:

May 11, 2005, 12:02:16 PM (21 years ago)

Author:

desonia

Message:

changed PS_PI* to M_PI*.

Location:

trunk/psLib/src/image

Files:

• psImageManip.c (modified) (4 diffs)
• psImageStats.c (modified) (3 diffs)

trunk/psLib/src/image/psImageManip.c

@@ -10 +10 @@
  *  @author Ross Harman, MHPCC
  *
- *  @version $Revision: 1.40 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-05-11 02:29:39 $
+ *  @version $Revision: 1.41 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-05-11 22:02:16 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -679 +679 @@
     }
     // put the angle in the range of 0...2PI.
-    angle = (float)((double)angle - (2.0*PS_PI) * floor(angle / (2.0*PS_PI)));
-
-    if (fabsf(angle - PS_PI_2) < FLT_EPSILON) {
+    angle = (float)((double)angle - (2.0*M_PI) * floor(angle / (2.0*M_PI)));
+
+    if (fabsf(angle - M_PI_2) < FLT_EPSILON) {
         // perform 1/4 rotate counter-clockwise
         psS32 numRows = in->numCols;
@@ -726 +726 @@
             }
         }
-    } else if (fabsf(angle - PS_PI) < FLT_EPSILON) {
+    } else if (fabsf(angle - M_PI) < FLT_EPSILON) {
         // perform 1/2 rotate
         psS32 numRows = in->numRows;
@@ -772 +772 @@
             }
         }
-    } else if (fabsf(angle - (PS_PI+PS_PI_2)) < FLT_EPSILON) {
+    } else if (fabsf(angle - (M_PI+M_PI_2)) < FLT_EPSILON) {
         // perform 1/4 rotate clockwise
         psS32 numRows = in->numCols;

trunk/psLib/src/image/psImageStats.c

@@ -9 +9 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.72 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-04-19 04:16:02 $
+ *  @version $Revision: 1.73 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-05-11 22:02:16 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -207 +207 @@
     for (i = 0; i < n; i++) {
         tmp = (double)(n - i);
-        tmp = (PS_PI * (tmp - 0.5)) / ((double)n);
+        tmp = (M_PI * (tmp - 0.5)) / ((double)n);
         scalingFactors[i] = cos(tmp);
     }
@@ -416 +416 @@
     // Chebyshev polynomials are 0.
     for (x = 0; x < input->numRows; x++) {
-        double xTmp = cos(PS_PI * (0.5 + ((float) x)) / ((float) input->numRows));
+        double xTmp = cos(M_PI * (0.5 + ((float) x)) / ((float) input->numRows));
         double xNode = - ((xTmp + bma + bpa) - 1.0);
         double xOrig = ((float) input->numRows) * (xNode - min) / (max - min);
 
         for (y = 0; y < input->numCols; y++) {
-            double yTmp = cos(PS_PI * (0.5 + ((float) y)) / ((float) input->numCols));
+            double yTmp = cos(M_PI * (0.5 + ((float) y)) / ((float) input->numCols));
             double yNode = - ((yTmp + bma + bpa) - 1.0);
             double yOrig = ((float) input->numCols) * (yNode - min) / (max - min);