Changeset 31434 for branches/czw_branch/20110406/psModules/src/objects/pmFootprintAssignPeaks.c

Timestamp:

May 4, 2011, 3:20:38 PM (15 years ago)

Author:

watersc1

Message:

Merging trunk into this branch

Location:

branches/czw_branch/20110406

Files:

• . (modified) (1 prop)
• psModules/src/objects/pmFootprintAssignPeaks.c (modified) (2 diffs)

branches/czw_branch/20110406/psModules/src/objects/pmFootprintAssignPeaks.c

@@ -35 +35 @@
     assert (peaks->n == 0 || psMemCheckPeak(peaks->data[0]));
     
-    if (footprints->n == 0) {
-        if (peaks->n > 0) {
-            return psError(PS_ERR_BAD_PARAMETER_SIZE, true, "Your list of footprints is empty");
-        }
+    if ((footprints->n == 0) && (peaks->n == 0)) {
         return PS_ERR_NONE;
     }
+
     /*
      * Create an image filled with the object IDs, and use it to assign pmPeaks to the
@@ -59 +57 @@
         
         if (ids) { assert (x >= 0 && x < numCols && y >= 0 && y < numRows);}
-        int id = ids ? ids->data.S32[y][x - col0] : 0;
-        // XXX I think the '[x - col0]' above is just wrong (should be [x], but never gets triggerd.
+        int id = ids ? ids->data.S32[y][x] : 0;
 
         if (id == 0) {                  // peak isn't in a footprint, so make one for it