Changeset 9730 for trunk/psModules/src/objects/pmPeaks.c

Timestamp:

Oct 24, 2006, 12:55:05 PM (20 years ago)

Author:

Paul Price

Message:

Following today's meeting, we agreed that psVectorAlloc (and therefore
psArrayAlloc also) shall set the number of elements in use to equal the
number of elements allocated. We introduce new functions,
psVectorAllocEmpty and psArrayAllocEmpty, that allocate a vector and set
the length to zero.

File:

• trunk/psModules/src/objects/pmPeaks.c (modified) (6 diffs)

trunk/psModules/src/objects/pmPeaks.c

@@ -6 +6 @@
  *  @author EAM, IfA: significant modifications.
  *
- *  @version $Revision: 1.9 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-09-15 09:49:01 $
+ *  @version $Revision: 1.10 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-10-24 22:55:05 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -40 +40 @@
 
     if (list == NULL) {
-        list = psArrayAlloc(100);
-        list->n = 0;
+        list = psArrayAllocEmpty(100);
     }
     psArrayAdd(list, 100, tmpPeak);
@@ -69 +68 @@
         tmpVector->data.F32[col] = image->data.F32[row][col];
     }
-    tmpVector->n = image->numCols;
     psTrace("psModules.objects", 4, "---- %s() end ----\n", __func__);
     return(tmpVector);
@@ -194 +192 @@
     if (n == 1) {
         psVector *tmpVector = NULL;
-        ;
         if (vector->data.F32[0] > threshold) {
             tmpVector = psVectorAlloc(1, PS_TYPE_U32);
             tmpVector->data.U32[0] = 0;
-            tmpVector->n = 1;
         } else {
             tmpVector = psVectorAlloc(0, PS_TYPE_U32);
@@ -238 +234 @@
     //
     psVector *tmpVector = psVectorAlloc(count, PS_TYPE_U32);
-    tmpVector->n = count;
     count = 0;
 
@@ -544 +539 @@
     PS_ASSERT_PTR_NON_NULL(peaks, NULL);
 
-    psArray *output = psArrayAlloc (200);
-    output->n = 0;
+    psArray *output = psArrayAllocEmpty (200);
 
     psTrace (".pmObjects.pmCullPeaks", 3, "list size is %ld\n", peaks->n);