Changeset 21183 for trunk/psModules/src/objects/pmFootprintFindAtPoint.c

Timestamp:

Jan 26, 2009, 8:40:07 PM (17 years ago)

Author:

eugene

Message:

incorporating changes from 16bit mask upgrades (eam_branch_20081230)

File:

• trunk/psModules/src/objects/pmFootprintFindAtPoint.c (modified) (7 diffs)

trunk/psModules/src/objects/pmFootprintFindAtPoint.c

@@ -4 +4 @@
  * @author RHL, Princeton & IfA; EAM, IfA
  *
- * @version $Revision: 1.3 $ $Name: not supported by cvs2svn $
- * @date $Date: 2008-12-08 02:51:14 $
+ * @version $Revision: 1.4 $ $Name: not supported by cvs2svn $
+ * @date $Date: 2009-01-27 06:39:38 $
  * Copyright 2006 Institute for Astronomy, University of Hawaii
  */
@@ -77 +77 @@
     
     if (mask != NULL) {                 // remember that we've detected these pixels
-        psMaskType *mpix = &mask->data.PS_TYPE_MASK_DATA[span->y - mask->row0][span->x0 - mask->col0];
+        psImageMaskType *mpix = &mask->data.PS_TYPE_IMAGE_MASK_DATA[span->y - mask->row0][span->x0 - mask->col0];
 
         for (int i = 0; i <= span->x1 - span->x0; i++) {
@@ -143 +143 @@
     psF32 *imgRowF32 = NULL;            // row pointer if F32
     psS32 *imgRowS32 = NULL;            //  "   "   "  "  !F32
-    psMaskType *maskRow = NULL;         //  masks's row pointer
+    psImageMaskType *maskRow = NULL;            //  masks's row pointer
     
     const int row0 = img->row0;
@@ -186 +186 @@
         imgRowF32 = img->data.F32[i];   // only one of
         imgRowS32 = img->data.S32[i];   //      these is valid!
-        maskRow = mask->data.PS_TYPE_MASK_DATA[i];
+        maskRow = mask->data.PS_TYPE_IMAGE_MASK_DATA[i];
         //
         // Search left from the pixel diagonally to the left of (i - di, x0). If there's
@@ -354 +354 @@
  * looking for the rest of the pmFootprint.  These are generally set from peaks.
  */
-   psImage *mask = psImageAlloc(numCols, numRows, PS_TYPE_MASK);
+   psImage *mask = psImageAlloc(numCols, numRows, PS_TYPE_IMAGE_MASK);
    P_PSIMAGE_SET_ROW0(mask, row0);
    P_PSIMAGE_SET_COL0(mask, col0);
@@ -365 +365 @@
        for (int i = 0; i < peaks->n; i++) {
            pmPeak *peak = peaks->data[i];
-           mask->data.PS_TYPE_MASK_DATA[peak->y - mask->row0][peak->x - mask->col0] |= PM_SSPAN_STOP;
+           mask->data.PS_TYPE_IMAGE_MASK_DATA[peak->y - mask->row0][peak->x - mask->col0] |= PM_SSPAN_STOP;
        }
    }
@@ -375 +375 @@
    imgRowF32 = img->data.F32[row];      // only one of
    imgRowS32 = img->data.S32[row];      //      these is valid!
-   psMaskType *maskRow = mask->data.PS_TYPE_MASK_DATA[row];
+   psImageMaskType *maskRow = mask->data.PS_TYPE_IMAGE_MASK_DATA[row];
    {
        int i;