Index: trunk/psModules/src/objects/pmFootprintAssignPeaks.c
===================================================================
--- trunk/psModules/src/objects/pmFootprintAssignPeaks.c	(revision 31153)
+++ trunk/psModules/src/objects/pmFootprintAssignPeaks.c	(revision 31332)
@@ -35,10 +35,8 @@
     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,6 +57,5 @@
 	
 	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
