Index: trunk/psphot/src/pmFootprint.h
===================================================================
--- trunk/psphot/src/pmFootprint.h	(revision 16820)
+++ trunk/psphot/src/pmFootprint.h	(revision 17443)
@@ -30,18 +30,27 @@
 int pmFootprintSetNpix(pmFootprint *fp);
 void pmFootprintSetBBox(pmFootprint *fp);
-psArray *pmFindFootprints(const psImage *img, const float threshold, const int npixMin);
-pmFootprint *pmFindFootprintAtPoint(const psImage *img,
+
+pmSpan *pmFootprintAddSpan(pmFootprint *fp,	// the footprint to add to
+			   const int y, // row to add
+			   int x0,      // range of
+			   int x1);    //          columns
+
+psArray *pmFootprintsFind(const psImage *img, const float threshold, const int npixMin);
+pmFootprint *pmFootprintsFindAtPoint(const psImage *img,
                                     const float threshold,
                                     const psArray *peaks,
                                     int row, int col);
 
-psArray *pmGrowFootprintArray(const psArray *footprints, int r);
-psArray *pmMergeFootprintArrays(const psArray *footprints1, const psArray *footprints2,
+psArray *pmFootprintArrayGrow(const psArray *footprints, int r);
+psArray *pmFootprintArraysMerge(const psArray *footprints1, const psArray *footprints2,
                                 const int includePeaks);
 
 psImage *pmSetFootprintArrayIDs(const psArray *footprints, const bool relativeIDs);
 psImage *pmSetFootprintID(const pmFootprint *fp, const int id);
+void pmSetFootprintArrayIDsForImage(psImage *idImage,
+				    const psArray *footprints, // the footprints to insert
+				    const bool relativeIDs); // show IDs starting at 0, not pmFootprint->id
 
-psErrorCode pmPeaksAssignToFootprints(psArray *footprints, const psArray *peaks);
+psErrorCode pmFootprintsAssignPeaks(psArray *footprints, const psArray *peaks);
 
 psErrorCode pmFootprintArrayCullPeaks(const psImage *img, const psImage *weight, psArray *footprints,