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

trunk/psLib/src/imageops/psImagePixelInterpolate.c

@@ -11 +11 @@
  *  @author Eugene Magnier, IfA
  *
- *  @version $Revision: 1.3 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2007-10-09 19:25:44 $
+ *  @version $Revision: 1.4 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2009-01-27 06:39:37 $
  *
  *  Copyright 2007 Institute for Astronomy, University of Hawaii
@@ -54 +54 @@
                     /* do not test self */ \
                     if (!jx && !jy) { continue; } \
-                    if (mask->data.PS_TYPE_MASK_DATA[iy+jy][ix+jx] & maskVal) { continue; } \
+                    if (mask->data.PS_TYPE_IMAGE_MASK_DATA[iy+jy][ix+jx] & maskVal) { continue; } \
                     nGood ++; \
                 } \
@@ -67 +67 @@
 // just the mask, the output image contains enum values which define the type of interpolation which
 // can be performed
-psImage *psImagePixelInterpolateState (int *nBad, int *nPoor, psImage *mask, psMaskType maskVal) {
+psImage *psImagePixelInterpolateState (int *nBad, int *nPoor, psImage *mask, psImageMaskType maskVal) {
 
     psImage *result = psImageAlloc (mask->numCols, mask->numRows, PS_TYPE_S32);
@@ -79 +79 @@
 
             // state of the good pixels (unmasked)
-            if (!(mask->data.PS_TYPE_MASK_DATA[iy][ix] & maskVal)) { 
+            if (!(mask->data.PS_TYPE_IMAGE_MASK_DATA[iy][ix] & maskVal)) { 
                 // count good neighbor pixels (+ self)
                 int nGood = 0;
@@ -94 +94 @@
                         if (jx + ix < 0) { continue; }
                         if (jx + ix >= mask->numCols) { continue; }
-                        if (mask->data.PS_TYPE_MASK_DATA[iy+jy][ix+jx] & maskVal) { continue; }
+                        if (mask->data.PS_TYPE_IMAGE_MASK_DATA[iy+jy][ix+jx] & maskVal) { continue; }
                         nGood ++;
                         minX = PS_MIN (minX, jx);
@@ -137 +137 @@
 
 // interpolate the poor pixels using the available options
-bool psImagePixelInterpolatePoor (psImage *image, psImage *state, psImage *mask, psMaskType maskVal) {
+bool psImagePixelInterpolatePoor (psImage *image, psImage *state, psImage *mask, psImageMaskType maskVal) {
 
     assert (image->numCols == state->numCols);
@@ -185 +185 @@
                           if (!jx && !jy) { continue; } 
                           // skip masked pixels
-                          if (mask->data.PS_TYPE_MASK_DATA[iy+jy][ix+jx] & maskVal) { continue; }
+                          if (mask->data.PS_TYPE_IMAGE_MASK_DATA[iy+jy][ix+jx] & maskVal) { continue; }
                           x->data.F32[n] = jx;
                           y->data.F32[n] = jy;
@@ -241 +241 @@
     
 // interpolate the good pixels to their true centers
-bool psImagePixelInterpolateCenter (psImage *value, psImage *xCoord, psImage *yCoord, psImage *state, psImage *mask, psMaskType maskVal) {
+bool psImagePixelInterpolateCenter (psImage *value, psImage *xCoord, psImage *yCoord, psImage *state, psImage *mask, psImageMaskType maskVal) {
 
     assert (value->numCols == state->numCols);
@@ -299 +299 @@
                           if (jx + ix >= value->numCols) { continue; } 
                           // skip masked pixels
-                          if (mask->data.PS_TYPE_MASK_DATA[iy+jy][ix+jx] & maskVal) { continue; }
+                          if (mask->data.PS_TYPE_IMAGE_MASK_DATA[iy+jy][ix+jx] & maskVal) { continue; }
                           x->data.F32[n] = xCoord->data.F32[iy+jy][ix+jx];
                           y->data.F32[n] = yCoord->data.F32[iy+jy][ix+jx];
@@ -331 +331 @@
                           if (jx + ix >= value->numCols) { continue; } 
                           // skip masked pixels
-                          if (mask->data.PS_TYPE_MASK_DATA[iy+jy][ix+jx] & maskVal) { continue; }
+                          if (mask->data.PS_TYPE_IMAGE_MASK_DATA[iy+jy][ix+jx] & maskVal) { continue; }
                           x->data.F32[n] = xCoord->data.F32[iy+jy][ix+jx];
                           y->data.F32[n] = yCoord->data.F32[iy+jy][ix+jx];
@@ -363 +363 @@
     for (int iy = 0; iy < value->numRows; iy++) {
         for (int ix = 0; ix < value->numCols; ix++) {
-          if (mask->data.PS_TYPE_MASK_DATA[iy][ix] & maskVal) { continue; }
+          if (mask->data.PS_TYPE_IMAGE_MASK_DATA[iy][ix] & maskVal) { continue; }
           value->data.F32[iy][ix] = output->data.F32[iy][ix];
         }