Changeset 6511 for trunk/psModules/src/imsubtract/pmSubtractBias.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/pmSubtractBias.c (modified) (12 diffs)

trunk/psModules/src/imsubtract/pmSubtractBias.c

@@ -6 +6 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.10 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-03-02 23:16:05 $
+ *  @version $Revision: 1.11 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-03-04 01:01:33 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -307 +307 @@
     // XXX: use psVectorCopy if they get it working.
     out->knots = psVectorAlloc(in->knots->n, in->knots->type.type);
+    out->knots->n = out->knots->nalloc;
     for (psS32 i = 0 ; i < in->knots->n ; i++) {
         out->knots->data.F32[i] = in->knots->data.F32[i];
@@ -346 +347 @@
     // Allocate the new vector.
     psVector *newVec = psVectorAlloc(n, PS_TYPE_F32);
-
+    newVec->n = newVec->nalloc;
     //
     // If the new vector is the same size as the old, simply copy the data.
@@ -491 +492 @@
     psS32 numOverscanImages = my_psListLength(bias);
     psVector *statsAll = psVectorAlloc(numOverscanImages, PS_TYPE_F32);
+    statsAll->n = statsAll->nalloc;
     psListElem *tmpOverscan = (psListElem *) bias->head;
     psS32 i = 0;
@@ -554 +556 @@
     psVector *tmpRow = psVectorAlloc(overscanImage->numCols, PS_TYPE_F32);
     psVector *tmpCol = psVectorAlloc(overscanImage->numRows, PS_TYPE_F32);
+    tmpRow->n = tmpRow->nalloc;
+    tmpCol->n = tmpCol->nalloc;
 
     //
@@ -594 +598 @@
     psVector *tmpRow = psVectorAlloc(overscanImage->numCols, PS_TYPE_F32);
     psVector *tmpCol = psVectorAlloc(overscanImage->numRows, PS_TYPE_F32);
+    tmpRow->n = tmpRow->nalloc;
+    tmpCol->n = tmpCol->nalloc;
 
     //
@@ -649 +655 @@
     psS32 vecSize = GetOverscanSize(inImg, overScanAxis);
     psVector *overscanVector = psVectorAlloc(vecSize, PS_TYPE_F32);
+    overscanVector->n = overscanVector->nalloc;
 
     //
@@ -658 +665 @@
     psS32 numOverscanImages = my_psListLength(bias);
     psVector **overscanVectors = (psVector **) psAlloc(numOverscanImages * sizeof(psVector *));
+    //    (*overscanVectors)->n = (*overscanVectors)->nalloc;
     for (psS32 i = 0 ; i < numOverscanImages ; i++) {
         overscanVectors[i] = NULL;
@@ -711 +719 @@
     //
     psVector *tmpVec = psVectorAlloc(numOverscanImages, PS_TYPE_F32);
+    tmpVec->n = tmpVec->nalloc;
     psF64 statValue;
     for (psS32 i = 0 ; i < vecSize ; i++) {
@@ -772 +781 @@
         psVector *myBin = psVectorAlloc(numBins, PS_TYPE_F32);
         psVector *binVec = psVectorAlloc(nBinOrig, PS_TYPE_F32);
+        myBin->n = myBin->nalloc;
+        binVec->n = binVec->nalloc;
 
         for (psS32 i=0;i<numBins;i++) {
@@ -859 +870 @@
     psS32 vecSize = GetOverscanSize(inImg, overScanAxis);
     psVector *newVec = psVectorAlloc(vecSize, PS_TYPE_F32);
+    newVec->n = newVec->nalloc;
     if ((nBin > 1) && (nBin < overscanVector->n)) {
         for (psS32 i = 0 ; i < vecSize ; i++) {
@@ -905 +917 @@
 
     psVector *newVec = psVectorAlloc(vecSize, PS_TYPE_F32);
+    newVec->n = newVec->nalloc;
     for (psS32 i = 0 ; i < vecSize ; i++) {
         newVec->data.F32[i] = overscanVector->data.F32[i/nBin];