Changeset 3977 for trunk/psLib/src/astro

Timestamp:

May 18, 2005, 7:18:20 PM (21 years ago)

Author:

desonia

Message:

fixes to psRegion.

Location:

trunk/psLib/src/astro

Files:

• psCoord.c (modified) (5 diffs)
• psCoord.h (modified) (4 diffs)

trunk/psLib/src/astro/psCoord.c

@@ -10 +10 @@
 *  @author GLG, MHPCC
 *
-*  @version $Revision: 1.66 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2005-05-11 22:02:15 $
+*  @version $Revision: 1.67 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2005-05-19 05:18:20 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -876 +876 @@
 psPlaneTransform *psPlaneTransformCombine(psPlaneTransform *out,
         const psPlaneTransform *trans1,
-        const psPlaneTransform *trans2)
-{
+        const psPlaneTransform *trans2,
+        psRegion region,
+        int nSamples)
+{
+
+    // XXX: This does not yet use region and nSamples:  need to modify -rdd
+
     PS_PTR_CHECK_NULL(trans1, NULL);
     PS_PTR_CHECK_NULL(trans2, NULL);
@@ -1128 +1133 @@
 psPlaneTransform *psPlaneTransformInvert(psPlaneTransform *out,
         const psPlaneTransform *in,
-        psRegion *region,
+        psRegion region,
         int nSamples)
 {
@@ -1138 +1143 @@
         return(p_psPlaneTransformLinearInvert((psPlaneTransform *) in));
     }
-    PS_PTR_CHECK_NULL(region, NULL);
     PS_INT_COMPARE(1, nSamples, NULL);
 
@@ -1197 +1201 @@
     psS32 cnt = 0;
     for (int yint = 0; yint < nSamples; yint++) {
-        inCoord->y = region->y0 + ((psF32) yint) * ((region->y1 - region->y0) / ((psF32) nSamples));
+        inCoord->y = region.y0 + ((psF32) yint) * ((region.y1 - region.y0) / ((psF32) nSamples));
         for (int xint = 0; xint < nSamples; xint++) {
-            inCoord->x = region->x0 + ((psF32) xint) * ((region->x1 - region->x0) / ((psF32) nSamples));
+            inCoord->x = region.x0 + ((psF32) xint) * ((region.x1 - region.x0) / ((psF32) nSamples));
             (void)psPlaneTransformApply(outCoord, in, inCoord);
 

trunk/psLib/src/astro/psCoord.h

@@ -10 +10 @@
 *  @author GLG, MHPCC
 *
-*  @version $Revision: 1.30 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2005-03-31 23:01:46 $
+*  @version $Revision: 1.31 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2005-05-19 05:18:20 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -383 +383 @@
     psPlaneTransform *out,             ///< a transform to recycle, or NULL if one is to be created.
     const psPlaneTransform *in,        ///< transform to invert
-    psRegion *region,                  ///< region to fit for non-linear transform inversion
+    psRegion region,                   ///< region to fit for non-linear transform inversion
     int nSamples                       ///< number of samples in each axis for fit
 );
@@ -404 +404 @@
     psPlaneTransform *out,             ///< a transform to recycle, or NULL if one is to be created.
     const psPlaneTransform *trans1,    ///< first transform to combine
-    const psPlaneTransform *trans2     ///< first transform to combine
+    const psPlaneTransform *trans2,    ///< first transform to combine
+    psRegion region,                   ///< region to cover (for non-linear transforms)
+    int nSamples                       ///< number of samples on each axis (for non-linear transforms)
 );
 
@@ -431 +433 @@
     float sigmaClip
 );
+//XXX: need to add doxygen comments on the parameters above. -rdd
 
 /// @}