Changeset 30815

Timestamp:

Mar 6, 2011, 2:59:23 PM (15 years ago)

Author:

eugene

Message:

handle case where we have peaks and no detected footprints

Location:

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

Files:

• pmFootprintAssignPeaks.c (modified) (2 diffs)
• pmFootprintIDs.c (modified) (1 diff)

branches/eam_branches/ipp-20110213/psModules/src/objects/pmFootprintAssignPeaks.c

@@ -46 +46 @@
      */
     psImage *ids = pmSetFootprintArrayIDs(footprints, true);
-    assert (ids != NULL);
-    assert (ids->type.type == PS_TYPE_S32);
-    const int row0 = ids->row0;
-    const int col0 = ids->col0;
-    const int numRows = ids->numRows;
-    const int numCols = ids->numCols;
+    if (ids) { assert (ids->type.type == PS_TYPE_S32); }
+    
+    const int row0 = ids ? ids->row0 : 0;
+    const int col0 = ids ? ids->col0 : 0;
+    const int numRows = ids ? ids->numRows : -1;
+    const int numCols = ids ? ids->numCols : -1;
 
     for (int i = 0; i < peaks->n; i++) {
@@ -58 +58 @@
         const int y = peak->y - row0;
         
-        assert (x >= 0 && x < numCols && y >= 0 && y < numRows);
-        int id = ids->data.S32[y][x - col0];
+        if (ids) { assert (x >= 0 && x < numCols && y >= 0 && y < numRows);}
+        int id = ids ? ids->data.S32[y][x - col0] : 0;
 
         if (id == 0) {                  // peak isn't in a footprint, so make one for it

branches/eam_branches/ipp-20110213/psModules/src/objects/pmFootprintIDs.c

@@ -66 +66 @@
 
    if (footprints->n == 0) {
-       psError(PS_ERR_BAD_PARAMETER_SIZE, true, "You didn't provide any footprints");
+       // XXX this was an error, but is an allowed condition -- NULL returned image means no footprints for any peaks
+       // psError(PS_ERR_BAD_PARAMETER_SIZE, true, "You didn't provide any footprints");
        return NULL;
    }