Changeset 6484 for trunk/psLib/src/imageops

Timestamp:

Feb 24, 2006, 1:43:16 PM (20 years ago)

Author:

drobbin

Message:

Changed psArray & psVector to zero 'n' upon allocation. Used to set vector->n = nalloc.

Location:

trunk/psLib/src/imageops

Files:

• psImageGeomManip.c (modified) (2 diffs)
• psImagePixelExtract.c (modified) (5 diffs)

trunk/psLib/src/imageops/psImageGeomManip.c

@@ -10 +10 @@
  *  @author Ross Harman, MHPCC
  *
- *  @version $Revision: 1.19 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-02-08 01:03:35 $
+ *  @version $Revision: 1.20 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-02-24 23:43:15 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -93 +93 @@
         }
         maskVec = psVectorAlloc(scale * scale, PS_TYPE_MASK);
+        maskVec->n = maskVec->nalloc;
         maskData = maskVec->data.PS_TYPE_MASK_DATA;
     }

trunk/psLib/src/imageops/psImagePixelExtract.c

@@ -8 +8 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.11 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-02-02 04:41:42 $
+ *  @version $Revision: 1.12 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-02-24 23:43:15 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -326 +326 @@
         // psStats.
         out = psVectorRecycle(out, numCols, PS_TYPE_F64);
+        out->n = numCols;
         if (coords != NULL) {
             coords = psPixelsRealloc(coords, numCols);
@@ -342 +343 @@
             maskVec = psVectorAlloc(numRows, mask->type.type);
         }
+        imgVec->n = imgVec->nalloc;
+        maskVec->n = maskVec->nalloc;
         #define PSIMAGE_CUT_VERTICAL(TYPE) \
     case PS_TYPE_##TYPE: { \
@@ -408 +411 @@
         imgVec = psAlloc(sizeof(psVector));
         imgVec->type = input->type;
-
         P_PSVECTOR_SET_NALLOC(imgVec,numCols);
-        imgVec->n = numCols;
         if (mask != NULL) {
             maskVec = psAlloc(sizeof(psVector));
             maskVec->type = mask->type;
             P_PSVECTOR_SET_NALLOC(maskVec,numCols);
-            maskVec->n = numCols;
         }
         // recycle output to make a proper sized/type output structure
@@ -421 +421 @@
         // psStats.
         out = psVectorRecycle(out, numRows, PS_TYPE_F64);
+        out->n = numRows;
+        imgVec->n = imgVec->nalloc;
+        maskVec->n = maskVec->nalloc;
         if (coords != NULL) {
             coords = psPixelsRealloc(coords, numRows);