Changeset 38058 for branches/eam_branches/ipp-20150112/psModules/src/objects/pmFootprintAssignPeaks.c

Timestamp:

Mar 29, 2015, 6:08:31 AM (11 years ago)

Author:

eugene

Message:

merge changes from trunk

Location:

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

Files:

• . (modified) (2 props)
• pmFootprintAssignPeaks.c (modified) (1 diff)

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

@@ -21 +21 @@
 pmSourceIO_CMF_PS1_DV3.c
 pmSourceIO_CMF_PS1_DV4.c
-
+pmSourceIO_CMF_PS1_DV5.c

@@ -21 +21 @@
 pmSourceIO_CMF_PS1_DV3.c
 pmSourceIO_CMF_PS1_DV4.c
-
+pmSourceIO_CMF_PS1_DV5.c

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

@@ -56 +56 @@
         const int y = peak->y - row0;
         
-        if (ids) { assert (x >= 0 && x < numCols && y >= 0 && y < numRows);}
+        if (ids) { psAssert (x >= 0 && x < numCols && y >= 0 && y < numRows, "out of range");}
         int id = ids ? ids->data.S32[y][x] : 0;
 

@@ -21 +21 @@
 pmSourceIO_CMF_PS1_DV3.c
 pmSourceIO_CMF_PS1_DV4.c
-
+pmSourceIO_CMF_PS1_DV5.c