Changeset 5552 for trunk/psModules/src

Timestamp:

Nov 18, 2005, 2:55:18 PM (21 years ago)

Author:

gusciora

Message:

Replaced psVectorCopy()

Location:

trunk/psModules/src

Files:

• astrom/pmAstrometry.c (modified) (3 diffs)
• imsubtract/pmSubtractBias.c (modified) (3 diffs)

trunk/psModules/src/astrom/pmAstrometry.c

@@ -8 +8 @@
 *  @author GLG, MHPCC
 *
-*  @version $Revision: 1.3 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2005-11-18 19:43:14 $
+*  @version $Revision: 1.4 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2005-11-19 00:55:18 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -498 +498 @@
     return(p_psDeproject(outSphere, tpCoord, projection));
 }
+/*****************************************************************************
+XXX: What about units for the (x,y) coords?
+ 
+XXX: This has not been tested.
+ *****************************************************************************/
+psPlane* pmCoordSkyToTP(
+    psPlane* tpCoord,
+    const psSphere* in,
+    const psProjection *projection)
+{
+    PS_ASSERT_PTR_NON_NULL(in, NULL);
+    PS_ASSERT_PTR_NON_NULL(projection, NULL);
+
+    return(p_psProject(tpCoord, in, projection));
+}
 
 
@@ -558 +573 @@
              "WARNING: psCoordCellToSkyQuick(): This function is not fully specified in the SDRS.  Returning NULL.\n");
     return(NULL);
-}
-
-
-/*****************************************************************************
-XXX: What about units for the (x,y) coords?
- 
-XXX: This has not been tested.
- *****************************************************************************/
-psPlane* pmCoordSkyToTP(
-    psPlane* tpCoord,
-    const psSphere* in,
-    const psProjection *projection)
-{
-    PS_ASSERT_PTR_NON_NULL(in, NULL);
-    PS_ASSERT_PTR_NON_NULL(projection, NULL);
-
-    return(p_psProject(tpCoord, in, projection));
 }
 

trunk/psModules/src/imsubtract/pmSubtractBias.c

@@ -6 +6 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.5 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-11-15 20:09:03 $
+ *  @version $Revision: 1.6 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-11-19 00:55:18 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -304 +304 @@
     }
 
-    out->knots = psVectorCopy(out->knots, in->knots, in->knots->type.type);
+    // XXX: use psVectorCopy if they get it working.
+    out->knots = psVectorAlloc(in->knots->n, in->knots->type.type);
+    for (psS32 i = 0 ; i < in->knots->n ; i++) {
+        out->knots->data.F32[i] = in->knots->data.F32[i];
+    }
+    /*
+        out->knots = psVectorCopy(out->knots, in->knots, in->knots->type.type);
+    */
 
     out->p_psDeriv2 = (psF32 *) psAlloc((in->n + 1) * sizeof(psF32));
@@ -1184 +1191 @@
     if (overscan == true) {
         pmOverscanAxis overScanAxis = GetOverscanAxis(in);
-
         //
         //  Create a psStats data structure and determine the highest