Changeset 9730 for trunk/psLib/src/imageops

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.

Location:

trunk/psLib/src/imageops

Files:

• psImageBackground.c (modified) (1 diff)
• psImageConvolve.c (modified) (5 diffs)
• psImageGeomManip.c (modified) (4 diffs)
• psImagePixelExtract.c (modified) (5 diffs)
• psImageStats.c (modified) (6 diffs)

trunk/psLib/src/imageops/psImageBackground.c

@@ -36 +36 @@
     int Npixels = nx*ny;                // Total number of pixels
 
-    psVector *values = psVectorAlloc(Nsubset, PS_TYPE_F32); // Vector containing subsample
+    psVector *values = psVectorAllocEmpty(Nsubset, PS_TYPE_F32); // Vector containing subsample
 
     // Minimum and maximum values

trunk/psLib/src/imageops/psImageConvolve.c

@@ -5 +5 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.39 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-10-13 21:13:48 $
+ *  @version $Revision: 1.40 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-10-24 22:52:55 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -505 +505 @@
         /* generate normalized gaussian */ \
         psVector *gaussnorm = psVectorAlloc(Npixel, PS_TYPE_##TYPE); \
-        gaussnorm->n = gaussnorm->nalloc; \
         { \
             double sum = 0.0; \
@@ -522 +521 @@
         { \
             psVector *calculation = psVectorAlloc(Nx, PS_TYPE_##TYPE); \
-            calculation->n = calculation->nalloc; \
             for (int j = 0; j < Ny; j++) { \
                 ps##TYPE *vi = image->data.TYPE[j]; \
@@ -573 +571 @@
         /* Smooth in Y direction */ \
         psArray *rows = psArrayAlloc(Nrange); \
-        rows->n = Nrange; \
         /* Smooth the first Nrange pixels, with renorm */ \
         int yMax = PS_MIN(Nrange, Ny); \
@@ -579 +576 @@
         for (int j = 0; j < yMax; j++) { \
             psVector *calculation = psVectorAlloc(Nx, PS_TYPE_##TYPE); \
-            calculation->n = calculation->nalloc; \
             /* Zero the output row */ \
             memset(calculation->data.TYPE, 0, Nx*sizeof(ps##TYPE)); \

trunk/psLib/src/imageops/psImageGeomManip.c

@@ -10 +10 @@
  *  @author Ross Harman, MHPCC
  *
- *  @version $Revision: 1.28 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-08-08 23:32:23 $
+ *  @version $Revision: 1.29 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-10-24 22:52:55 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -80 +80 @@
     }
 
-    vec = psVectorAlloc(scale * scale, in->type.type);
+    vec = psVectorAllocEmpty(scale * scale, in->type.type);
 
     if (mask != NULL) {
@@ -93 +93 @@
             return NULL;
         }
-        maskVec = psVectorAlloc(scale * scale, PS_TYPE_MASK);
-        maskVec->n = maskVec->nalloc;
+        maskVec = psVectorAllocEmpty(scale * scale, PS_TYPE_MASK);
         maskData = maskVec->data.PS_TYPE_MASK_DATA;
     }
@@ -134 +133 @@
                 } \
                 vec->n = n; \
+                maskVec->n = n; \
                 myStats = psVectorStats(myStats, vec, NULL, maskVec, maskVal); \
                 outRowData[col] = (ps##TYPE)psStatsGetValue(myStats, statistic); \

trunk/psLib/src/imageops/psImagePixelExtract.c

@@ -8 +8 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.27 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-08-26 04:34:28 $
+ *  @version $Revision: 1.28 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-10-24 22:52:55 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -18 +18 @@
 
 #include "psMemory.h"
+#include "psVector.h"
 #include "psImagePixelExtract.h"
 #include "psError.h"
@@ -392 +393 @@
     if (direction == PS_CUT_X_POS || direction == PS_CUT_X_NEG) {
         psVector* imgVec = psVectorAlloc(numRows, type);
-        imgVec->n = imgVec->nalloc;
         psVector* maskVec = NULL;
         psMaskType* maskData = NULL;
@@ -417 +417 @@
         if (mask != NULL) {
             maskVec = psVectorAlloc(numRows, mask->type.type);
-            maskVec->n = maskVec->nalloc;
         }
         #define PSIMAGE_CUT_VERTICAL(TYPE) \
@@ -855 +854 @@
         // n.b. alloc enough for the data by making the vectors slightly larger
         // than the area of the region of interest.
-        buffer[lcv] = psVectorAlloc(1+4*(rSq[lcv+1]-rSq[lcv]),
-                                    input->type.type);
-        buffer[lcv]->n = 0;
+        buffer[lcv] = psVectorAllocEmpty(1+4*(rSq[lcv+1]-rSq[lcv]),
+                                         input->type.type);
 
         bufferMask[lcv] = NULL;
         if (mask != NULL) {
-            bufferMask[lcv] = psVectorAlloc(1+4*(rSq[lcv+1]-rSq[lcv]),
-                                            PS_TYPE_MASK);
-            bufferMask[lcv]->n = 0;
+            bufferMask[lcv] = psVectorAllocEmpty(1+4*(rSq[lcv+1]-rSq[lcv]),
+                                                 PS_TYPE_MASK);
         }
     }

trunk/psLib/src/imageops/psImageStats.c

@@ -9 +9 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.100 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-08-26 04:34:28 $
+ *  @version $Revision: 1.101 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-10-24 22:52:55 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -76 +76 @@
 
         junkData = psVectorAlloc(numRows*numCols, in->type.type);
-        junkData->n = junkData->nalloc;
 
         psU8* data = junkData->data.U8;
@@ -100 +99 @@
 
             junkMask = psVectorAlloc(numRows*numCols, mask->type.type);
-            junkMask->n = junkMask->nalloc;
 
             psU8* data = junkMask->data.U8;
@@ -149 +147 @@
 
         junkData = psVectorAlloc(numRows*numCols, in->type.type);
-        junkData->n = junkData->nalloc;
 
         psU8* data = junkData->data.U8;
@@ -173 +170 @@
 
             junkMask = psVectorAlloc(numRows*numCols, mask->type.type);
-            junkMask->n = junkMask->nalloc;
 
             psU8* data = junkMask->data.U8;
@@ -592 +588 @@
         return -1;
     }/* else if (col0 == col1 && row0 == row1) {
-                                                psError(PS_ERR_BAD_PARAMETER_VALUE, true,
-                                                        "Invalid psRegion specified.  Region contains only 1 pixel.\n");
-                                                return -1;
-                                            }
-                                        */
+                                                    psError(PS_ERR_BAD_PARAMETER_VALUE, true,
+                                                            "Invalid psRegion specified.  Region contains only 1 pixel.\n");
+                                                    return -1;
+                                                }
+                                            */
     x0 = col0;
     x1 = col1;