Changeset 6511 for trunk/psModules/src/imsubtract/pmImageSubtract.c

Timestamp:

Mar 3, 2006, 3:01:34 PM (20 years ago)

Author:

drobbin

Message:

Updated files to reflect psArray, psVector, & psPixels changes in psLib that set n=0 upon allocation.

File:

• trunk/psModules/src/imsubtract/pmImageSubtract.c (modified) (9 diffs)

trunk/psModules/src/imsubtract/pmImageSubtract.c

@@ -7 +7 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.1 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-09-28 20:43:52 $
+ *  @version $Revision: 1.2 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-03-04 01:01:33 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -119 +119 @@
     tmp->u = psVectorAlloc(nBF, PS_TYPE_F32);
     tmp->v = psVectorAlloc(nBF, PS_TYPE_F32);
+    tmp->u->n = tmp->u->nalloc;
+    tmp->v->n = tmp->v->nalloc;
     tmp->sigma = NULL;
     tmp->xOrder = psVectorAlloc(nBF, PS_TYPE_F32);
+    tmp->xOrder->n = tmp->xOrder->nalloc;
     tmp->yOrder = psVectorAlloc(nBF, PS_TYPE_F32);
+    tmp->yOrder->n = tmp->yOrder->nalloc;
     tmp->subIndex = 0;
     tmp->preCalc = NULL;
@@ -216 +220 @@
     tmp->u = psVectorAlloc(nBF, PS_TYPE_F32);
     tmp->v = psVectorAlloc(nBF, PS_TYPE_F32);
+    tmp->u->n = tmp->u->nalloc;
+    tmp->v->n = tmp->v->nalloc;
     tmp->sigma = psVectorAlloc(nBF, PS_TYPE_F32);
     tmp->xOrder = psVectorAlloc(nBF, PS_TYPE_F32);
@@ -223 +229 @@
     tmp->spatialOrder = spatialOrder;
     tmp->preCalc = psArrayAlloc(nBF);
+    tmp->u->n = tmp->u->nalloc;
+    tmp->v->n = tmp->v->nalloc;
+    tmp->sigma->n = tmp->sigma->nalloc;
+    tmp->xOrder->n = tmp->xOrder->nalloc;
+    tmp->yOrder->n = tmp->yOrder->nalloc;
+    tmp->preCalc->n = tmp->preCalc->nalloc;
 
     //
@@ -352 +364 @@
     } else {
         stamps = (psArray *) psArrayAlloc(xNum * yNum);
+        stamps->n = stamps->nalloc;
         for (psS32 s = 0 ; s < (xNum * yNum) ; s++) {
             stamps->data[s] = (psPtr *) p_pmStampAlloc(PM_STAMP_REJECTED);
@@ -810 +823 @@
             if (stampVector == NULL) {
                 stampVector = psVectorAlloc(numSolveParams, PS_TYPE_F64);
+                stampVector->n = stampVector->nalloc;
                 stamp->vector = stampVector;
             } else {
@@ -1028 +1042 @@
     } else {
         solution = psVectorAlloc(size, PS_TYPE_F64);
+        solution->n = solution->nalloc;
     }
 
@@ -1039 +1054 @@
     psImage *sumMatrix = psImageAlloc(size, size, PS_TYPE_F64);
     psVector *sumVector = psVectorAlloc(size, PS_TYPE_F64);
+    sumVector->n = sumVector->nalloc;
     PS_VECTOR_SET_F64(sumVector, 0.0);
     PS_IMAGE_SET_F64(sumMatrix, 0.0);
@@ -1131 +1147 @@
     } else {
         deviations = psVectorAlloc(stamps->n, PS_TYPE_F32);
+        deviations->n = deviations->nalloc;
         // XXX: Probably not necessary.
         PS_VECTOR_SET_F32(deviations, 0.0);