Changeset 21074 for branches/eam_branch_20081230/psLib/src/imageops/psImageMap.c

Timestamp:

Dec 30, 2008, 10:40:00 AM (17 years ago)

Author:

eugene

Message:

upgrades to the masking concepts: added psImageMaskType & psVectorMaskType and associated macros; replaced psMaskType where appropriate (see src/mask.notes.txt)

File:

• branches/eam_branch_20081230/psLib/src/imageops/psImageMap.c (modified) (4 diffs)

branches/eam_branch_20081230/psLib/src/imageops/psImageMap.c

@@ -7 +7 @@
  *  @author Eugene Magnier, IfA
  *
- *  @version $Revision: 1.11 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2008-11-17 02:37:28 $
+ *  @version $Revision: 1.11.6.1 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2008-12-30 20:39:59 $
  *
  *  Copyright 2007 Institute for Astronomy, University of Hawaii
@@ -145 +145 @@
     }
 
-    psImage *mask = psImageAlloc (map->map->numCols, map->map->numRows, PS_TYPE_MASK);
+    psImage *mask = psImageAlloc (map->map->numCols, map->map->numRows, PS_TYPE_IMAGE_MASK);
     psImage *xCoord = psImageAlloc (map->map->numCols, map->map->numRows, PS_TYPE_F32);
     psImage *yCoord = psImageAlloc (map->map->numCols, map->map->numRows, PS_TYPE_F32);
@@ -212 +212 @@
             // this will not in general be properly weighted...
             if (psVectorStats (map->stats, fCell, dfCell, NULL, 0)) {
-                mask->data.U8[iy][ix] = 0;
+                mask->data.PS_TYPE_IMAGE_MASK_DATA[iy][ix] = 0;
                 // XXX ensure only one option is selected, or save both position and width
                 map->map->data.F32[iy][ix] = psStatsGetValue (map->stats, map->stats->options);
@@ -224 +224 @@
                 yCoord->data.F32[iy][ix] = psStatsGetValue (meanStat, meanStat->options);
             } else {
-                mask->data.U8[iy][ix] = 1;
+                mask->data.PS_TYPE_IMAGE_MASK_DATA[iy][ix] = 1;
             }