Changeset 25027 for branches/pap/psphot/src/psphotFindFootprints.c

Timestamp:

Aug 7, 2009, 4:08:25 PM (17 years ago)

Author:

Paul Price

Message:

Merging trunk (r25026) to get up-to-date on old branch.

Location:

branches/pap

Files:

• . (modified) (1 prop)
• psphot (modified) (1 prop)
• psphot/src (modified) (1 prop)
• psphot/src/psphotFindFootprints.c (modified) (1 diff)

branches/pap/psphot/src

@@ -17 +17 @@
 growthTest
 psphotVersionDefinitions.h
+psphotMomentsStudy

@@ -17 +17 @@
 growthTest
 psphotVersionDefinitions.h
+psphotMomentsStudy

branches/pap/psphot/src/psphotFindFootprints.c

@@ -59 +59 @@
 
         psArray *mergedFootprints = pmFootprintArraysMerge(detections->footprints, footprints, includePeaks);
-        psLogMsg ("psphot", PS_LOG_MINUTIA, "merged %ld new footprints with %ld existing ones: %f sec\n", footprints->n, detections->footprints->n, psTimerMark ("psphot.footprints"));
+        psLogMsg ("psphot", PS_LOG_MINUTIA, "merged %ld new footprints with %ld existing ones: %f sec\n", footprints->n, (detections->footprints ? detections->footprints->n : 0), psTimerMark ("psphot.footprints"));
 
         psFree(footprints);

@@ -17 +17 @@
 growthTest
 psphotVersionDefinitions.h
+psphotMomentsStudy