Changeset 10609

Timestamp:

Dec 10, 2006, 7:29:51 AM (19 years ago)

Author:

magnier

Message:

replaced p_psProject, p_psDeproject with psProject, psDeproject

Location:

trunk/psLib/src/astro

Files:

• psCoord.c (modified) (4 diffs)
• psCoord.h (modified) (3 diffs)
• psSphereOps.c (modified) (3 diffs)

trunk/psLib/src/astro/psCoord.c

@@ -10 +10 @@
 *  @author GLG, MHPCC
 *
-*  @version $Revision: 1.126 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2006-10-24 22:52:55 $
+*  @version $Revision: 1.127 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2006-12-10 17:29:29 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -349 +349 @@
 
 
-psPlane* p_psProject(
+psPlane* psProject(
     psPlane *outPlane,
     const psSphere* coord,
@@ -437 +437 @@
 }
 
-psPlane* psProject(
-    const psSphere* coord,
-    const psProjection* projection)
-{
-    return(p_psProject(NULL, coord, projection));
-}
-
-psSphere* p_psDeproject(
+psSphere* psDeproject(
     psSphere *outSphere,
     const psPlane* coord,
@@ -560 +553 @@
 }
 
-psSphere* psDeproject(
-    const psPlane* coord,
-    const psProjection* projection)
-{
-    return(p_psDeproject(NULL, coord, projection));
-}
-
-
 /*****************************************************************************
 multiplyDPoly2D(trans1, trans2): Takes two 2-D polynomials as input and

trunk/psLib/src/astro/psCoord.h

@@ -11 +11 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.53 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-07-18 22:50:47 $
+ *  @version $Revision: 1.54 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-12-10 17:29:51 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -288 +288 @@
  */
 psPlane* psProject(
-    const psSphere* coord,             ///< coordinate to project
-    const psProjection* projection     ///< parameters of the projection
-);
-
-psPlane* p_psProject(
     psPlane *out,
     const psSphere* coord,             ///< coordinate to project
@@ -303 +298 @@
  */
 psSphere* psDeproject(
-    const psPlane* coord,              ///< coordinate to project
-    const psProjection* projection     ///< parameters of the projection
-);
-
-/** Private reverse projection of a linear coordinate to a spherical coordinate system
- *
- *  @return psPlane*    projected coordinate
- */
-psSphere* p_psDeproject(
     psSphere *outSphere,
     const psPlane* coord,              ///< coordinate to project

trunk/psLib/src/astro/psSphereOps.c

@@ -8 +8 @@
  *  @author Dave Robbins, MHPCC
  *
- *  @version $Revision: 1.17 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-11-09 23:26:04 $
+ *  @version $Revision: 1.18 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-12-10 17:29:51 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -335 +335 @@
                                                PS_PROJ_TAN);
         // Perform projection onto tangent plane
-        psPlane* lin = psProject(position2, proj);
+        psPlane* lin = psProject(NULL, position2, proj);
         // Set return values
         tmp->r = lin->x;
@@ -417 +417 @@
                                                PS_PROJ_TAN);
         // Project tangent plane coord to spherical coord
-        tmp = psDeproject(lin, proj);
+        tmp = psDeproject(NULL, lin, proj);
         // Free data structures used
         psFree(proj);