Changeset 21183 for trunk/psLib/src/imageops/psImageMap.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/psLib/src/imageops/psImageMap.c (modified) (6 diffs)

trunk/psLib/src/imageops/psImageMap.c

@@ -7 +7 @@
  *  @author Eugene Magnier, IfA
  *
- *  @version $Revision: 1.12 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2009-01-27 00:00:21 $
+ *  @version $Revision: 1.13 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2009-01-27 06:39:37 $
  *
  *  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;
             }
 
@@ -353 +353 @@
 }
 
-psVector *psImageMapEvalVector(const psImageMap *map, const psVector *mask, psMaskType maskValue, const psVector *x, const psVector *y)
+psVector *psImageMapEvalVector(const psImageMap *map, const psVector *mask, psVectorMaskType maskValue, const psVector *x, const psVector *y)
 {
     PS_ASSERT_IMAGE_MAP_NON_NULL(map, NULL);
@@ -365 +365 @@
 
     for (int i = 0; i < x->n; i++) {
-      if (mask && (mask->data.U8[i] & maskValue)) {
+      if (mask && (mask->data.PS_TYPE_VECTOR_MASK_DATA[i] & maskValue)) {
         result->data.F32[i] = 0.0;
       } else {