Changeset 12744 for trunk/pswarp/src/pswarpTransformReadout.c

Timestamp:

Apr 4, 2007, 12:54:56 PM (19 years ago)

Author:

Paul Price

Message:

Updating following API change to psImagePixelInterpolate

File:

• trunk/pswarp/src/pswarpTransformReadout.c (modified) (3 diffs)

trunk/pswarp/src/pswarpTransformReadout.c

@@ -3 +3 @@
 bool pswarpTransformReadout (pmReadout *output, pmReadout *input, pmConfig *config) {
 
-    // XXX this implementation currently ignores the use of the region 
+    // XXX this implementation currently ignores the use of the region
     psImage *region = NULL;
     pmCell *cell = NULL;
@@ -13 +13 @@
     int outNy = output->image->numRows;
 
-    psPlane *inPix = psPlaneAlloc();    // Coordinates on the input detector
-    psPlane *outPix = psPlaneAlloc();   // Coordinates on the output detector
+    psPlane *inPix = psPlaneAlloc();    // Coordinates on the input detector
+    psPlane *outPix = psPlaneAlloc();   // Coordinates on the output detector
 
-    psPlane *FP = psPlaneAlloc();       // Coordinates on the focal plane
-    psPlane *TP = psPlaneAlloc();       // Coordinates on the tangent plane
-    psSphere *sky = psSphereAlloc();    // Coordinates on the sky
+    psPlane *FP = psPlaneAlloc();       // Coordinates on the focal plane
+    psPlane *TP = psPlaneAlloc();       // Coordinates on the tangent plane
+    psSphere *sky = psSphereAlloc();    // Coordinates on the sky
 
     cell = input->parent;
@@ -31 +31 @@
     psImage *inImage = input->image;
 
+    psImageInterpolateOptions *interp = psImageInterpolateOptionsAlloc(PS_INTERPOLATE_BILINEAR, inImage,
+                                                                       NULL, NULL, 0, NAN, NAN, 0, 0, 0.0);
+
     // Iterate over the output image pixels
     for (int y = 0; y < outNy; y++) {
-        for (int x = 0; x < outNx; x++) {
-            // Only transform those pixels requested
-            if (region && region->data.U8[y][x]) continue;
+        for (int x = 0; x < outNx; x++) {
+            // Only transform those pixels requested
+            if (region && region->data.U8[y][x]) continue;
 
-            // XXX double check this 1/2 pixel offset
-            outPix->x = (double)x + 0.5;
-            outPix->y = (double)y + 0.5;
+            // XXX double check this 1/2 pixel offset
+            outPix->x = (double)x + 0.5;
+            outPix->y = (double)y + 0.5;
 
-            psPlaneTransformApply(FP, chipOutput->toFPA, outPix);
-            psPlaneTransformApply (TP, fpaOutput->toTPA, FP);
-            psDeproject (sky, TP, fpaOutput->toSky);
-                
-            psProject (TP, sky, fpaInput->toSky);
-            psPlaneTransformApply (FP, fpaInput->fromTPA, TP);
-            psPlaneTransformApply (inPix, chipInput->fromFPA, FP);
+            psPlaneTransformApply(FP, chipOutput->toFPA, outPix);
+            psPlaneTransformApply (TP, fpaOutput->toTPA, FP);
+            psDeproject (sky, TP, fpaOutput->toSky);
 
-            // XXX get interpolation method from the recipe
-            outData[y][x] = (psF32)psImagePixelInterpolate(inImage, inPix->x, inPix->y, NULL, 1, NAN, PS_INTERPOLATE_BILINEAR);
-            // outData[y][x] = (psF32)psImagePixelInterpolate(inImage, inPix->x, inPix->y, mask, 1, NAN, PS_INTERPOLATE_BILINEAR);
-            // modify zero and scale?
-        }
+            psProject (TP, sky, fpaInput->toSky);
+            psPlaneTransformApply (FP, fpaInput->fromTPA, TP);
+            psPlaneTransformApply (inPix, chipInput->fromFPA, FP);
+
+            // XXX get interpolation method from the recipe
+            double value;
+            if (!psImageInterpolate(&value, NULL, NULL, inPix->x, inPix->y, interp)) {
+                psError(PS_ERR_UNKNOWN, false, "Unable to interpolate image.");
+                psFree(interp);
+                psFree(inPix);
+                psFree(outPix);
+                psFree(FP);
+                psFree(TP);
+                psFree(sky);
+                return false;
+            }
+
+            outData[y][x] = value;
+            // modify zero and scale?
+        }
     }
-
-    psFree (inPix);
-    psFree (outPix);
-    psFree (FP);
-    psFree (TP);
-    psFree (sky);
+    psFree(interp);
+    psFree(inPix);
+    psFree(outPix);
+    psFree(FP);
+    psFree(TP);
+    psFree(sky);
 
     return true;
 }
-
-# if (0)
-            if (error) {
-                // Error is actually the variance
-                outError->data.F32[y][x] = (psF32)p_psImageErrorInterpolateBILINEAR_F32(error,
-                                                                                        detector->x,
-                                                                                        detector->y,
-                                                                                        mask, 1, NAN);
-            }
-            if (error) {
-                outError->data.F32[y][x] = outError->data.F32[y][x] / SQUARE(scale);
-            }
-# endif