Changeset 21363 for trunk/psModules/src/objects/pmResiduals.c

Timestamp:

Feb 5, 2009, 4:31:25 PM (17 years ago)

Author:

Paul Price

Message:

Merging pap_branch_20090128. Resolved a small number of conflicts. Compiles, but not tested in detail.

File:

• trunk/psModules/src/objects/pmResiduals.c (modified) (4 diffs)

trunk/psModules/src/objects/pmResiduals.c

@@ -4 +4 @@
  *
  * @author EAM, IfA
- * @version $Revision: 1.4 $ $Name: not supported by cvs2svn $
- * @date $Date: 2009-01-27 06:39:38 $
+ * @version $Revision: 1.5 $ $Name: not supported by cvs2svn $
+ * @date $Date: 2009-02-06 02:31:25 $
  * Copyright 2004 IfA, University of Hawaii
  */
@@ -23 +23 @@
     psFree (resid->Rx);
     psFree (resid->Ry);
-    psFree (resid->weight);
+    psFree (resid->variance);
     psFree (resid->mask);
     return;
@@ -42 +42 @@
     resid->Rx  = psImageAlloc (nX, nY, PS_TYPE_F32);
     resid->Ry  = psImageAlloc (nX, nY, PS_TYPE_F32);
-    resid->weight = psImageAlloc (nX, nY, PS_TYPE_F32);
+    resid->variance = psImageAlloc (nX, nY, PS_TYPE_F32);
     resid->mask   = psImageAlloc (nX, nY, PM_TYPE_RESID_MASK);
 
@@ -49 +49 @@
     resid->xBin = xBin;
     resid->yBin = yBin;
-    resid->xCenter = 0.5*(nX - 1); 
+    resid->xCenter = 0.5*(nX - 1);
     resid->yCenter = 0.5*(nY - 1);
     return resid;