Changeset 17459

Timestamp:

Apr 21, 2008, 8:18:33 AM (18 years ago)

Author:

eugene

Message:

pmSetFootprintID now recycles an image if supplied

Location:

branches/eam_branch_20080413/psphot/src

Files:

• pmFootprint.h (modified) (1 diff)
• pmFootprintIDs.c (modified) (2 diffs)

branches/eam_branch_20080413/psphot/src/pmFootprint.h

@@ -47 +47 @@
 
 psImage *pmSetFootprintArrayIDs(const psArray *footprints, const bool relativeIDs);
-psImage *pmSetFootprintID(const pmFootprint *fp, const int id);
+psImage *pmSetFootprintID(psImage *idImage, const pmFootprint *fp, const int id);
 void pmSetFootprintArrayIDsForImage(psImage *idImage,
                                     const psArray *footprints, // the footprints to insert

branches/eam_branch_20080413/psphot/src/pmFootprintIDs.c

@@ -74 +74 @@
  * Set an image to the value of footprint's ID whever they may fall
  */
-psImage *pmSetFootprintID(const pmFootprint *fp, // the footprint to insert
+psImage *pmSetFootprintID(psImage *idImage,
+                          const pmFootprint *fp, // the footprint to insert
                           const int id) {       // the desired ID
    assert(fp != NULL && pmFootprintTest((const psPtr)fp));
@@ -83 +84 @@
    assert (numCols >= 0 && numRows >= 0);
    
-   psImage *idImage = psImageAlloc(numCols, numRows, PS_TYPE_S32);
+   if (idImage == NULL) {
+       idImage = psImageAlloc(numCols, numRows, PS_TYPE_S32);
+   } else {
+       assert (idImage->numCols == numCols);
+       assert (idImage->numRows == numRows);
+       // XXX assert on type (S32)
+   }
    P_PSIMAGE_SET_ROW0(idImage, row0);
    P_PSIMAGE_SET_COL0(idImage, col0);