Changeset 14725 for branches/eam_branch_20070830/psLib/src/imageops/psImagePixelInterpolate.c

Timestamp:

Sep 2, 2007, 10:29:50 AM (19 years ago)

Author:

magnier

Message:

fix compile bugs in psImageMap, psImagePixelInterpolate

File:

• branches/eam_branch_20070830/psLib/src/imageops/psImagePixelInterpolate.c (modified) (5 diffs)

branches/eam_branch_20070830/psLib/src/imageops/psImagePixelInterpolate.c

@@ -11 +11 @@
  *  @author Eugene Magnier, IfA
  *
- *  @version $Revision: 1.1.2.3 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2007-09-02 02:42:55 $
+ *  @version $Revision: 1.1.2.4 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2007-09-02 20:29:50 $
  *
  *  Copyright 2007 Institute for Astronomy, University of Hawaii
@@ -62 +62 @@
 
 // count and mark pixels based on their potential for being interpolated.  the input image is
-// just the mask, the output image is the mask image in which the good, bad, and poor pixels
-// are marked.
-// XXX return in the image the state (2nd, which of 4 corners, etc)?
+// 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) {
 
@@ -99 +98 @@
 
 // interpolate the poor pixels using the available options
-bool psImagePixelInterpolatePoor (psImage *image, psImage *mask, psMaskType maskVal, psImage *state) {
+bool psImagePixelInterpolatePoor (psImage *image, psImage *state, psImage *mask, psMaskType maskVal) {
+
+    assert (image->numCols == state->numCols);
+    assert (image->numRows == state->numRows);
+    assert (image->numCols == mask->numCols);
+    assert (image->numRows == mask->numRows);
+
+    // allocate the vectors for the 2nd order fit below
+    psVector *f  = psVectorAlloc (9, PS_TYPE_F32);
+    // XXX if we add the weight above, include df
+    // psVector *df = psVectorAlloc (9, PS_TYPE_F32); 
+    psVector *x  = psVectorAlloc (9, PS_TYPE_F32);
+    psVector *y  = psVectorAlloc (9, PS_TYPE_F32);
+
+    // allocate a 2D polynomial to fit a quadratic to the valid neighbor pixels.
+    psPolynomial2D *poly = psPolynomial2DAlloc (PS_POLYNOMIAL_ORD, 2, 2);
+    poly->mask[2][2] = 1;
+    poly->mask[2][1] = 1;
+    poly->mask[1][2] = 1;
 
     for (int iy = 0; iy < state->numRows; iy++) {
@@ -114 +131 @@
 
               case PS_IMAGE_INTERPOLATE_CENTER: {
-                  // fit a quadratic to the valid neighbor pixels
-                  // apply the quadratic to get the poor pixel value
-                  psPolynomial2D *poly = psPolynomial2DAlloc (PS_POLYNOMIAL_ORD, 2, 2);
-                  poly->mask[2][2] = 1;
-                  poly->mask[2][1] = 1;
-                  poly->mask[1][2] = 1;
-                  psVector *f = psVectorAlloc (9, PS_TYPE_F32);
-                  psVector *df = psVectorAlloc (9, PS_TYPE_F32);
-                  psVector *x = psVectorAlloc (9, PS_TYPE_F32);
-                  psVector *y = psVectorAlloc (9, PS_TYPE_F32);
-
+                  // XXX is there a fit-image-region function?
                   int n = 0;
                   for (int jy = -1; jy <= +1; jy++) {
-                      // skip invalid pixels (jx < 0, >= Nx), etc
+                      // skip invalid pixels 
                       if (jy + iy < 0) { continue; }
                       if (jy + iy >= image->numRows) { continue; }
                       for (int jx = -1; jx <= +1; jx++) {
-                          // skip invalid pixels (jx < 0, >= Nx), etc
+                          // skip invalid pixels 
                           if (jx + ix < 0) { continue; } 
-                          if (jx + ix >= mask->numCols) { continue; } 
-                          /* skip self */
+                          if (jx + ix >= image->numCols) { continue; } 
+                          // skip self 
                           if (!jx && !jy) { continue; } 
                           // skip masked pixels
-                          if (mask->data.PS_TYPE_MASK_DATA[iy+jy][ix+jx] & maskVal) { continue; } \
-                          f->data.F32[n] = image->data.F32[iy+jy][ix+jx];
-                          // df->data.F32[n] = weight->data.F32[jy][jx];
+                          if (mask->data.PS_TYPE_MASK_DATA[iy+jy][ix+jx] & maskVal) { continue; }
                           x->data.F32[n] = jx;
                           y->data.F32[n] = jy;
+                          f->data.F32[n] = image->data.F32[iy+jy][ix+jx];
+                          // df->data.F32[n] = weight->data.F32[iy+jy][ix+jx];
                           n++;
                       }
                   }
-                  // XXX set vector lengths here
+                  // set vector lengths here
                   x->n = n;
                   y->n = n;
                   f->n = n;
                   // df->n = n;
-                  psVectorFitPolynomial2D (poly, mask, maskValue, f, df, x, y);
+                  // psVectorFitPolynomial2D (poly, NULL, 0xff, f, df, x, y);
+                  psVectorFitPolynomial2D (poly, NULL, 0xff, f, NULL, x, y);
+                  // apply the fitted quadratic to get the poor pixel value
                   image->data.F32[iy][ix] = poly->coeff[0][0];
                   break; }
@@ -179 +188 @@
         }           
     }
+
+    psFree (x);
+    psFree (y);
+    psFree (f);
+
+    psFree (poly);
     return true;
 }