Changeset 12744 for trunk/stac/src

Timestamp:

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

Author:

Paul Price

Message:

Updating following API change to psImagePixelInterpolate

Location:

trunk/stac/src

Files:

• stacRejection.c (modified) (2 diffs)
• stacTransform.c (modified) (3 diffs)

trunk/stac/src/stacRejection.c

@@ -111 +111 @@
 #endif
 
+        psImageInterpolateOptions *interp = psImageInterpolateOptionsAlloc(PS_INTERPOLATE_BILINEAR,
+                                                                           reject, NULL, NULL, 0, 0.0, 0.0,
+                                                                           0, 0, 0.0);
+
         // Transform the mask
         // Optimisation option is to only transform the pixels that have been rejected in the output,
@@ -125 +129 @@
                     inCoords->y = (double)y + 0.5;
                     (void)psPlaneTransformApply(outCoords, map, inCoords);
-                    float maskVal = (float)psImagePixelInterpolate(reject, outCoords->x, outCoords->y,
-                                                                   NULL, 0, 0.0, PS_INTERPOLATE_BILINEAR);
+                    double maskVal;
+                    if (!psImageInterpolate(&maskVal, NULL, NULL, outCoords->x, outCoords->y, interp)) {
+                        psError(PS_ERR_UNKNOWN, false, "Unable to interpolate image.");
+                        psFree(grads);
+                        psFree(gradsMask);
+                        psFree(inCoords);
+                        psFree(outCoords);
+                        return NULL;
+                    }
+
 #ifdef TESTING
                     rejmap->data.F32[y][x] = maskVal;

trunk/stac/src/stacTransform.c

@@ -193 +193 @@
         }
 
+        psImageInterpolateOptions *interp = psImageInterpolateOptionsAlloc(PS_INTERPOLATE_BILINEAR,
+                                                                           image, error, mask, 1, NAN, NAN,
+                                                                           1, 0, 0.0);
+
         // Iterate over the output image pixels
         for (int y = 0; y < outny; y++) {
@@ -204 +208 @@
 
                     // Change PS_INTERPOLATE_BILINEAR to best available technique.
-                    outImage->data.F32[y][x] = (psF32)psImagePixelInterpolate(image, detector->x,
-                                                                              detector->y, mask, 1, NAN,
-                                                                              PS_INTERPOLATE_BILINEAR);
+                    double imageValue, varianceValue;
+                    if (!psImageInterpolate(&imageValue, &varianceValue, NULL,
+                                            detector->x, detector->y, interp)) {
+                        psError(PS_ERR_UNKNOWN, false, "Unable to interpolate image.");
+                        psFree(interp);
+                        psFree(detector);
+                        psFree(sky);
+                        return false;
+                    }
+                    outImage->data.F32[y][x] = imageValue;
+
                     if (error) {
                         // Error is actually the variance
-                        outError->data.F32[y][x] = (psF32)p_psImageErrorInterpolateBILINEAR_F32(error,
-                                                                                                detector->x,
-                                                                                                detector->y,
-                                                                                                mask, 1, NAN);
+                        outError->data.F32[y][x] = varianceValue;
                     }
 
@@ -224 +233 @@
             }
         } // Iterating over output pixels
+        psFree(interp);
 
     } // Iterating over images