Changeset 32200

Timestamp:

Aug 29, 2011, 2:50:41 AM (15 years ago)

Author:

eugene

Message:

add structure to peaks to carry the saddle points

Location:

branches/eam_branches/ipp-20110710/psModules/src/objects

Files:

• pmPeaks.c (modified) (2 diffs)
• pmPeaks.h (modified) (1 diff)

branches/eam_branches/ipp-20110710/psModules/src/objects/pmPeaks.c

@@ -137 +137 @@
 *****************************************************************************/
 static void peakFree(pmPeak *tmp)
-{} //
+{
+    if (!tmp) return;
+    psFree (tmp->saddlePoints);
+    return;
+}
 
 pmPeak *pmPeakAlloc(psS32 x,
@@ -162 +166 @@
     tmp->type = type;
     tmp->footprint = NULL;
+    tmp->saddlePoints = NULL;
 
     psMemSetDeallocator(tmp, (psFreeFunc) peakFree);

branches/eam_branches/ipp-20110710/psModules/src/objects/pmPeaks.h

@@ -72 +72 @@
     pmPeakType type;                    ///< Description of peak.
     pmFootprint *footprint;             ///< reference to containing footprint
+    psArray *saddlePoints;              ///< set of saddle points between this peak and near neighbors
 }
 pmPeak;